From 8c5113954de1bde45048e98252331716cd42a79e Mon Sep 17 00:00:00 2001
From: Cory Chaplin <cory.chaplin@laposte.net>
Date: Thu, 13 Feb 2014 00:15:58 +0100
Subject: [PATCH] Fix auto-scrolling on applets

---
 client/src/views/channel.js | 2 +-
 client/src/views/panel.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/views/channel.js b/client/src/views/channel.js
index cac5365..fb8caaf 100644
--- a/client/src/views/channel.js
+++ b/client/src/views/channel.js
@@ -209,7 +209,7 @@ _kiwi.view.Channel = _kiwi.view.Panel.extend({
             }
         }).apply(this);
 
-        this.scrollToBottom();
+        if(this.model.isActive()) this.scrollToBottom();
 
         // Make sure our DOM isn't getting too large (Acts as scrollback)
         this.msg_count++;
diff --git a/client/src/views/panel.js b/client/src/views/panel.js
index 3827def..b73fb4d 100644
--- a/client/src/views/panel.js
+++ b/client/src/views/panel.js
@@ -57,7 +57,7 @@ _kiwi.view.Panel = Backbone.View.extend({
 
         _kiwi.app.view.doLayout();
 
-        this.scrollToBottom(true);
+        if(!this.model.applet) this.scrollToBottom(true);
     },
 
 
-- 
2.25.1