From 9b8b5711dc90acfd10db61f27aeddb369729e228 Mon Sep 17 00:00:00 2001 From: Dzaporozhets Date: Tue, 31 Jan 2017 10:38:07 +0600 Subject: [PATCH 1/5] Fix issue #475. User with multiple sessions does not show in occupants list --- src/view/pane/roster.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/pane/roster.js b/src/view/pane/roster.js index b12aa81b..ae5e6cca 100644 --- a/src/view/pane/roster.js +++ b/src/view/pane/roster.js @@ -185,7 +185,7 @@ Candy.View.Pane = (function(self, $) { } // first user in roster if(!userInserted) { - rosterPane.append(html); + rosterPane.append($html); } }, From a33d07cdb04cb2e9e555b1bc66843efdf2b0a474 Mon Sep 17 00:00:00 2001 From: Dzaporozhets Date: Thu, 2 Feb 2017 11:41:49 +0600 Subject: [PATCH 2/5] Update grunt-contrib-jshint to avoid erorrs in grunt jshint task --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee4bef1f..89843a60 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "grunt-contrib-compress": "^0.13.0", "grunt-contrib-concat": "^0.5.1", "grunt-contrib-cssmin": "^0.14.0", - "grunt-contrib-jshint": "^0.10.0", + "grunt-contrib-jshint": "^1.1.0", "grunt-contrib-uglify": "^0.4.0", "grunt-contrib-watch": "^0.6.1", "grunt-coveralls": "^0.3.0", From f7008dd79852748490838ddd35b076f5184dd67b Mon Sep 17 00:00:00 2001 From: Dzaporozhets Date: Tue, 21 Feb 2017 14:38:10 +0600 Subject: [PATCH 3/5] hide toolbar if all tabs closed --- src/view/pane/chat.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js index 196ba2f2..ac744754 100644 --- a/src/view/pane/chat.js +++ b/src/view/pane/chat.js @@ -196,10 +196,11 @@ Candy.View.Pane = (function(self, $) { * (Boolean) - false, this will stop the event from bubbling */ allTabsClosed: function() { + self.Chat.Toolbar.hide(); + self.Chat.hideMobileIcon(); + if (Candy.Core.getOptions().disconnectWithoutTabs) { Candy.Core.disconnect(); - self.Chat.Toolbar.hide(); - self.Chat.hideMobileIcon(); return; } }, From 4e48a5e7b59171c62c8846a0a8d0da5ee8fac504 Mon Sep 17 00:00:00 2001 From: Dzaporozhets Date: Tue, 21 Feb 2017 15:45:56 +0600 Subject: [PATCH 4/5] remove style attribute when toolbar is hidden --- src/view/pane/chat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/view/pane/chat.js b/src/view/pane/chat.js index ac744754..36ba0396 100644 --- a/src/view/pane/chat.js +++ b/src/view/pane/chat.js @@ -385,7 +385,7 @@ Candy.View.Pane = (function(self, $) { * Hide toolbar. */ hide: function() { - $('#chat-toolbar').hide(); + $('#chat-toolbar').removeAttr('style').hide(); }, /* Function: update From 10ec7a220b383b856b90b1bf461d64ecc77f875d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= Date: Mon, 10 Apr 2017 23:28:33 +0600 Subject: [PATCH 5/5] write getter for unreadMessages --- src/view/pane/window.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/view/pane/window.js b/src/view/pane/window.js index 00e2e690..b49b0e22 100644 --- a/src/view/pane/window.js +++ b/src/view/pane/window.js @@ -70,6 +70,10 @@ Candy.View.Pane = (function(self) { } }, + getUnreadMessagesCount: function() { + return self.Window._unreadMessagesCount; + }, + /** Function: clearUnreadMessages * Clear unread message count in window title. */