Fix auto-scrolling on applets

diff --git a/client/src/views/channel.js b/client/src/views/channel.js
index cac53655b4238e4c04f0611c109b75215d0d517f..fb8caafd54bb7d2ff7ae327ecd535e64aa665e8c 100644 (file)
--- 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 3827def17f4e7b7aee188fdb86ec2948f7752394..b73fb4d3f2f3ac7bcf0be3b22205879fb9f7eac7 100644 (file)
--- 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);
     },