Commit 7039dbe0 authored by JC Brand's avatar JC Brand

Move chat minimization to a separate plugin

parent fc251db5
......@@ -46,16 +46,17 @@ require.config({
// Converse
"converse-api": "src/converse-api",
"converse-chatview": "src/converse-chatview",
"converse-rosterview": "src/converse-rosterview",
"converse-controlbox": "src/converse-controlbox",
"converse-core": "src/converse-core",
"converse-headline": "src/converse-headline",
"converse-mam": "src/converse-mam",
"converse-minimize": "src/converse-minimize",
"converse-muc": "src/converse-muc",
"converse-notification": "src/converse-notification",
"converse-otr": "src/converse-otr",
"converse-ping": "src/converse-ping",
"converse-register": "src/converse-register",
"converse-rosterview": "src/converse-rosterview",
"converse-templates": "src/converse-templates",
// Off-the-record-encryption
......@@ -236,6 +237,7 @@ if (typeof define !== 'undefined') {
"converse-register", // XEP-0077 In-band registration
"converse-ping", // XEP-0199 XMPP Ping
"converse-notification",// HTML5 Notifications
"converse-minimize", // Allows chat boxes to be minimized
"converse-headline", // Support for headline messages
/* END: Removable components */
......
......@@ -66,12 +66,13 @@
},
ChatBoxes: {
chatBoxShouldBeShown: function (chatbox) {
return this._super.chatBoxShouldBeShown.apply(this, arguments) &&
chatbox.get('id') !== 'controlbox';
},
onChatBoxesFetched: function (collection, resp) {
collection.each(function (chatbox) {
if (chatbox.get('id') !== 'controlbox' && !chatbox.get('minimized')) {
chatbox.trigger('show');
}
});
this._super.onChatBoxesFetched.apply(this, arguments);
if (!_.include(_.pluck(resp, 'id'), 'controlbox')) {
this.add({
id: 'controlbox',
......@@ -80,7 +81,6 @@
}
this.get('controlbox').save({connected:true});
},
},
ChatBoxViews: {
......@@ -126,17 +126,6 @@
},
MinimizedChats: {
onChanged: function (item) {
if (item.get('id') === 'controlbox') {
return;
} else {
this._super.onChanged.apply(this, arguments);
}
}
},
ChatBox: {
initialize: function () {
if (this.get('id') === 'controlbox') {
......@@ -330,17 +319,20 @@
return this;
},
show: function () {
converse.controlboxtoggle.hide(function () {
converse.chatboxviews.trimChats(this);
this.$el.show('fast', function () {
if (converse.rosterview) {
converse.rosterview.update();
}
utils.refreshWebkit();
}.bind(this));
onControlBoxToggleHidden: function () {
this.$el.show('fast', function () {
if (converse.rosterview) {
converse.rosterview.update();
}
utils.refreshWebkit();
converse.emit('controlBoxOpened', this);
}.bind(this));
},
show: function () {
converse.controlboxtoggle.hide(
this.onControlBoxToggleHidden.bind(this)
);
return this;
},
......
This diff is collapsed.
This diff is collapsed.
......@@ -14,7 +14,7 @@
"converse-core",
"converse-api",
// TODO remove next two dependencies
"converse-chatview",
"converse-chatview",
"converse-controlbox"
], factory);
}(this, function (converse, converse_api) {
......@@ -933,7 +933,7 @@
}
return true;
},
fetchArchivedMessages: function (options) {
/* Fetch archived chat messages from the XMPP server.
*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment