Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Rename onShow to onMaximized and add onMinimized

Browse Source
This commit is contained in:
JC Brand 2016-03-09 09:59:25 +00:00
parent 7b2f75ec72
commit ce9008a56a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/converse-core.js
View File

@ -2142,7 +2142,7 @@
return this; return this;
}, },
onShow: function () { onMaximized: function () {
converse.chatboxviews.trimChats(this); converse.chatboxviews.trimChats(this);
utils.refreshWebkit(); utils.refreshWebkit();
this.$content.scrollTop(this.model.get('scroll')); this.$content.scrollTop(this.model.get('scroll'));
@ -2150,10 +2150,15 @@
converse.emit('chatBoxMaximized', this); converse.emit('chatBoxMaximized', this);
}, },
onMinimized: function () {
utils.refreshWebkit();
converse.emit('chatBoxMinimized', this);
},
maximize: function () { maximize: function () {
// Restore a minimized chat box // Restore a minimized chat box
$('#conversejs').prepend(this.$el); $('#conversejs').prepend(this.$el);
this.$el.show('fast', this.onShow.bind(this)); this.$el.show('fast', this.onMaximized.bind(this));
return this; return this;
}, },
@ -2161,10 +2166,8 @@
if (ev && ev.preventDefault) { ev.preventDefault(); } if (ev && ev.preventDefault) { ev.preventDefault(); }
// save the scroll position to restore it on maximize // save the scroll position to restore it on maximize
this.model.save({'scroll': this.$content.scrollTop()}); this.model.save({'scroll': this.$content.scrollTop()});
// Minimizes a chat box
this.setChatState(converse.INACTIVE).model.minimize(); this.setChatState(converse.INACTIVE).model.minimize();
this.$el.hide('fast', utils.refreshwebkit); this.$el.hide('fast', this.onMinimized.bind(this));
converse.emit('chatBoxMinimized', this);
}, },
updateVCard: function () { updateVCard: function () {