Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue #475. #502

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix issue #475. #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b8b571
Fix issue #475.
Jan 31, 2017
a33d07c
Update grunt-contrib-jshint to avoid erorrs in
Feb 2, 2017
f7008dd
hide toolbar if all tabs closed
Feb 21, 2017
4e48a5e
remove style attribute when toolbar is hidden
Feb 21, 2017
10ec7a2
write getter for unreadMessages
DmitriyZaporozhets Apr 10, 2017
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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