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

Attach panels to the DOM upon initialize.

Browse Source 
On Plone I've been having issues with event handlers being registered on
elements not yet added to the DOM not being called.

Also, get rid of the misnamed $parent attribute on the panels. Instead, pass in
the correct parent to initialize.
This commit is contained in:
JC Brand 2013-08-02 12:26:16 +02:00
parent 7c0e7049f2
commit 72ca5158f3
1 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
converse.js
View File

@ -628,15 +628,20 @@
'<li>' '<li>'
), ),
initialize: function (cfg) {
cfg.$parent.append(this.$el);
this.$tabs = cfg.$parent.parent().find('#controlbox-tabs');
},
render: function () { render: function () {
var markup; var markup;
this.$parent.find('#controlbox-tabs').append(this.tab_template()); this.$tabs.append(this.tab_template());
this.$parent.find('#controlbox-panes').append(this.$el.html(this.template()));
if (converse.xhr_user_search) { if (converse.xhr_user_search) {
markup = this.search_contact_template(); markup = this.search_contact_template();
} else { } else {
markup = this.add_contact_template(); markup = this.add_contact_template();
} }
this.$el.html(this.template());
this.$el.find('.search-xmpp ul').append(markup); this.$el.find('.search-xmpp ul').append(markup);
this.$el.append(converse.rosterview.$el); this.$el.append(converse.rosterview.$el);
return this; return this;
@ -788,18 +793,15 @@
'</form>'+ '</form>'+
'<dl id="available-chatrooms"></dl>'), '<dl id="available-chatrooms"></dl>'),
render: function () { initialize: function (cfg) {
this.$parent.find('#controlbox-tabs').append(this.tab_template()); cfg.$parent.append(
this.$parent.find('#controlbox-panes').append(
this.$el.html( this.$el.html(
this.template({ this.template({
server_input_type: converse.hide_muc_server && 'hidden' || 'text' server_input_type: converse.hide_muc_server && 'hidden' || 'text'
}) })
).hide()); ).hide());
return this; this.$tabs = cfg.$parent.parent().find('#controlbox-tabs');
},
initialize: function () {
this.on('update-rooms-list', function (ev) { this.on('update-rooms-list', function (ev) {
this.updateRoomsList(); this.updateRoomsList();
}); });
@ -814,6 +816,11 @@
}, this)); }, this));
}, },
render: function () {
this.$tabs.append(this.tab_template());
return this;
},
informNoRoomsFound: function () { informNoRoomsFound: function () {
var $available_chatrooms = this.$el.find('#available-chatrooms'); var $available_chatrooms = this.$el.find('#available-chatrooms');
// # For translators: %1$s is a variable and will be replaced with the XMPP server name // # For translators: %1$s is a variable and will be replaced with the XMPP server name
@ -1030,15 +1037,14 @@
}, },
render: function () { render: function () {
this.$el.html(this.template(this.model.toJSON()));
if ((!converse.prebind) && (!converse.connection)) { if ((!converse.prebind) && (!converse.connection)) {
// Add login panel if the user still has to authenticate // Add login panel if the user still has to authenticate
this.loginpanel = new converse.LoginPanel(); this.$el.html(this.template(this.model.toJSON()));
this.loginpanel.$parent = this.$el; this.loginpanel = new converse.LoginPanel({'$parent': this.$el.find('#controlbox-panes')});
this.loginpanel.render(); this.loginpanel.render();
} else { } else if (!this.contactspanel) {
this.contactspanel = new converse.ContactsPanel(); this.$el.html(this.template(this.model.toJSON()));
this.contactspanel.$parent = this.$el; this.contactspanel = new converse.ContactsPanel({'$parent': this.$el.find('#controlbox-panes')});
this.contactspanel.render(); this.contactspanel.render();
converse.xmppstatus = new converse.XMPPStatus(); converse.xmppstatus = new converse.XMPPStatus();
converse.xmppstatus.localStorage = new Backbone.LocalStorage( converse.xmppstatus.localStorage = new Backbone.LocalStorage(
@ -1057,8 +1063,7 @@
}); });
converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus}); converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus});
converse.xmppstatusview.render(); converse.xmppstatusview.render();
this.roomspanel = new converse.RoomsPanel(); this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('#controlbox-panes')});
this.roomspanel.$parent = this.$el;
this.roomspanel.render(); this.roomspanel.render();
} }
return this; return this;
@ -2506,6 +2511,17 @@
}, this)); }, this));
}, },
initialize: function (cfg) {
cfg.$parent.append(this.$el.html(this.template()));
this.$tabs = cfg.$parent.parent().find('#controlbox-tabs');
},
render: function () {
this.$tabs.append(this.tab_template());
this.$el.find('input#jid').focus();
return this;
},
authenticate: function (ev) { authenticate: function (ev) {
ev.preventDefault(); ev.preventDefault();
var $form = $(ev.target), var $form = $(ev.target),
@ -2537,19 +2553,8 @@
}, },
remove: function () { remove: function () {
this.$parent.find('#controlbox-tabs').empty(); this.$tabs.empty();
this.$parent.find('#controlbox-panes').empty(); this.$el.parent().empty();
},
render: function () {
this.$parent.find('#controlbox-tabs').append(this.tab_template());
var template = this.template();
if (! this.bosh_url_input) {
template.find('form').append(this.bosh_url_input);
}
this.$parent.find('#controlbox-panes').append(this.$el.html(template));
this.$el.find('input#jid').focus();
return this;
} }
}); });