Skip to content

C
converse.js
Commit 297259fd authored by JC Brand's avatar JC Brand
Browse files
Options

Remember toggle state of control box. updates #222

parent 21d96556
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 63 deletions
converse.js
View file @ 297259fd
......@@ -1432,9 +1432,7 @@
},
close: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
if (ev && ev.preventDefault) { ev.preventDefault(); }
if (converse.connection.connected) {
this.model.destroy();
} else {
......@@ -1915,23 +1913,34 @@
initialize: function () {
this.$el.insertAfter(converse.controlboxtoggle.$el);
this.model.on('change:connected', $.proxy(function (item) {
if (this.model.get('connected')) {
this.render();
this.initRoster();
converse.features.off('add', this.featureAdded, this);
converse.features.on('add', this.featureAdded, this);
// Features could have been added before the controlbox was
// initialized. Currently we're only interested in MUC
var feature = converse.features.findWhere({'var': 'http://jabber.org/protocol/muc'});
if (feature) {
this.featureAdded(feature);
}
}
}, this));
this.model.on('show', this.show, this);
this.model.on('change:connected', this.onConnected, this);
this.model.on('destroy', this.hide, this);
this.model.on('hide', this.hide, this);
this.model.on('show', this.show, this);
this.model.on('change:closed', this.ensureClosedState, this);
this.render();
if (this.model.get('connected')) {
this.initRoster();
}
if (!this.model.get('closed')) {
this.show();
} else {
this.hide();
}
},
onConnected: function () {
if (this.model.get('connected')) {
this.render().initRoster();
converse.features.off('add', this.featureAdded, this);
converse.features.on('add', this.featureAdded, this);
// Features could have been added before the controlbox was
// initialized. Currently we're only interested in MUC
var feature = converse.features.findWhere({'var': 'http://jabber.org/protocol/muc'});
if (feature) {
this.featureAdded(feature);
}
}
},
initRoster: function () {
......@@ -1948,6 +1957,7 @@
this.contactspanel.$el.append(converse.rosterview.$el);
converse.rosterview.render().fetch().update();
converse.connection.roster.get(function () {});
return this;
},
render: function () {
......@@ -1985,6 +1995,25 @@
this.initDragResize();
},
close: function (ev) {
if (ev && ev.preventDefault) { ev.preventDefault(); }
if (converse.connection.connected) {
this.model.save({'closed': true});
} else {
this.model.trigger('hide');
}
converse.emit('controlBoxClosed', this);
return this;
},
ensureClosedState: function () {
if (this.model.get('closed')) {
this.hide();
} else {
this.show();
}
},
hide: function (callback) {
this.$el.hide('fast', function () {
converse.refreshWebkit();
......@@ -1995,6 +2024,7 @@
}
});
});
return this;
},
show: function () {
......@@ -2745,24 +2775,17 @@
onConnected: function () {
this.browserStorage = new Backbone.BrowserStorage[converse.storage](
b64_sha1('converse.chatboxes-'+converse.bare_jid));
if (!this.get('controlbox')) {
this.add({
id: 'controlbox',
box_id: 'controlbox'
});
}
this.get('controlbox').fetch();
// This line below will make sure the Roster is set up
this.get('controlbox').save({connected:true});
this.registerMessageHandler();
// Get cached chatboxes from localstorage
this.fetch({
add: true,
success: $.proxy(function (collection, resp) {
if (_.include(_.pluck(resp, 'id'), 'controlbox')) {
// If the controlbox was saved in localstorage, it must be visible
this.get('controlbox').trigger('show');
if (!_.include(_.pluck(resp, 'id'), 'controlbox')) {
this.add({
id: 'controlbox',
box_id: 'controlbox'
});
}
this.get('controlbox').save({connected:true});
}, this)
});
},
......@@ -2909,7 +2932,7 @@
if (item.get('chatroom')) {
view = new converse.ChatRoomView({'model': item});
} else if (item.get('box_id') === 'controlbox') {
view = new converse.ControlBoxView({model: item}).render();
view = new converse.ControlBoxView({model: item});
} else {
view = new converse.ChatBoxView({model: item});
}
......@@ -3053,9 +3076,7 @@
},
close: function (ev) {
if (ev && ev.preventDefault) {
ev.preventDefault();
}
if (ev && ev.preventDefault) { ev.preventDefault(); }
this.remove();
this.model.destroy();
converse.emit('chatBoxClosed', this);
......@@ -4460,15 +4481,16 @@
},
render: function () {
var toggle = this.$el.html(
$('#conversejs').prepend(this.$el.html(
converse.templates.controlbox_toggle({
'label_toggle': __('Toggle chat')
})
);
if (converse.show_controlbox_by_default) {
toggle.hide(); // It's either or
}
$('#conversejs').prepend(toggle);
));
// We let the render method of ControlBoxView decide whether
// the ControlBox or the Toggle must be shown. This prevents
// artifacts (i.e. on page load the toggle is shown only to then
// seconds later be hidden in favor of the control box).
this.$el.hide();
return this;
},
......@@ -4483,17 +4505,13 @@
showControlBox: function () {
var controlbox = converse.chatboxes.get('controlbox');
if (!controlbox) {
converse.chatboxes.add({
id: 'controlbox',
box_id: 'controlbox',
height: converse.default_box_height
});
controlbox = converse.chatboxes.get('controlbox');
if (converse.connection.connected) {
converse.chatboxes.get('controlbox').save();
}
controlbox = converse.addControlBox();
}
if (converse.connection.connected) {
controlbox.save({closed: false});
} else {
controlbox.trigger('show');
}
controlbox.trigger('show');
},
onClick: function (e) {
......@@ -4501,7 +4519,7 @@
if ($("div#controlbox").is(':visible')) {
var controlbox = converse.chatboxes.get('controlbox');
if (converse.connection.connected) {
controlbox.destroy();
controlbox.save({closed: true});
} else {
controlbox.trigger('hide');
}
......@@ -4511,6 +4529,15 @@
}
});
this.addControlBox = function () {
return this.chatboxes.add({
id: 'controlbox',
box_id: 'controlbox',
height: this.default_box_height,
closed: !this.show_controlbox_by_default
});
};
this.initConnection = function () {
var rid, sid, jid;
if (this.connection) {
......@@ -4579,6 +4606,7 @@
this.otr = new this.OTR();
this.initSession();
this.initConnection();
this.addControlBox();
return this;
};
......@@ -4586,7 +4614,6 @@
// --------------
// This is the end of the initialize method.
this._initialize();
if (this.show_controlbox_by_default) { this.controlboxtoggle.showControlBox(); }
this.registerGlobalEventHandlers();
converse.emit('initialized');
};
......
spec/chatbox.js
View file @ 297259fd
......@@ -209,22 +209,25 @@
runs(function () {
test_utils.closeControlBox();
});
waits(250);
waits(50);
runs(function () {
expect(converse.emit).toHaveBeenCalledWith('chatBoxClosed', jasmine.any(Object));
expect(converse.chatboxes.length).toEqual(0);
expect(converse.chatboxes.length).toEqual(1);
expect(converse.chatboxes.pluck('id')).toEqual(['controlbox']);
test_utils.openChatBoxes(6);
expect(converse.chatboxviews.trimChats).toHaveBeenCalled();
expect(converse.chatboxes.length).toEqual(6);
expect(converse.chatboxes.length).toEqual(7);
expect(converse.emit).toHaveBeenCalledWith('chatBoxOpened', jasmine.any(Object));
test_utils.closeAllChatBoxes();
});
waits(250);
waits(50);
runs(function () {
expect(converse.chatboxes.length).toEqual(0);
expect(converse.chatboxes.length).toEqual(1);
expect(converse.chatboxes.pluck('id')).toEqual(['controlbox']);
expect(converse.emit).toHaveBeenCalledWith('chatBoxClosed', jasmine.any(Object));
var newchatboxes = new this.ChatBoxes();
expect(newchatboxes.length).toEqual(0);
expect(converse.chatboxes.pluck('id')).toEqual(['controlbox']);
// onConnected will fetch chatboxes in browserStorage, but
// because there aren't any open chatboxes, there won't be any
// in browserStorage either. XXX except for the controlbox
......
spec/chatroom.js
View file @ 297259fd
......@@ -95,13 +95,15 @@
"reason='"+reason+"'/>"+
"</message>"
)[0];
expect(converse.chatboxes.models.length).toBe(0);
expect(converse.chatboxes.models.length).toBe(1);
expect(converse.chatboxes.models[0].id).toBe("controlbox");
converse.chatboxes.onInvite(message);
expect(window.confirm).toHaveBeenCalledWith(
name + ' has invited you to join a chat room: '+ room_jid +
', and left the following reason: "'+reason+'"');
expect(converse.chatboxes.models.length).toBe(1);
expect(converse.chatboxes.models[0].id).toBe(room_jid);
expect(converse.chatboxes.models.length).toBe(2);
expect(converse.chatboxes.models[0].id).toBe('controlbox');
expect(converse.chatboxes.models[1].id).toBe(room_jid);
}, converse));
it("shows received groupchat messages", $.proxy(function () {
......@@ -269,14 +271,12 @@
test_utils.openChatRoom('lounge', 'localhost', 'dummy');
// We instantiate a new ChatBoxes collection, which by default
// will be empty.
spyOn(this.chatboxviews, 'trimChats');
test_utils.openControlBox();
var newchatboxes = new this.ChatBoxes();
expect(newchatboxes.length).toEqual(0);
// The chatboxes will then be fetched from browserStorage inside the
// onConnected method
newchatboxes.onConnected();
expect(this.chatboxviews.trimChats).toHaveBeenCalled();
expect(newchatboxes.length).toEqual(2); // XXX: Includes controlbox, is this a bug?
// Check that the chatrooms retrieved from browserStorage
// have the same attributes values as the original ones.
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7