Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Fix issue #475. #502

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions src/view/pane/chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
},
Expand Down Expand Up @@ -384,7 +385,7 @@ Candy.View.Pane = (function(self, $) {
* Hide toolbar.
*/
hide: function() {
$('#chat-toolbar').hide();
$('#chat-toolbar').removeAttr('style').hide();
},

/* Function: update
Expand Down
2 changes: 1 addition & 1 deletion src/view/pane/roster.js
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ Candy.View.Pane = (function(self, $) {
}
// first user in roster
if(!userInserted) {
rosterPane.append(html);
rosterPane.append($html);
}
},

Expand Down
4 changes: 4 additions & 0 deletions src/view/pane/window.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ Candy.View.Pane = (function(self) {
}
},

getUnreadMessagesCount: function() {
return self.Window._unreadMessagesCount;
},

/** Function: clearUnreadMessages
* Clear unread message count in window title.
*/
Expand Down