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

Changed the following:

Browse Source 
- Chain calls on initialize method of RosterView
- Moved dom insertion out of loops on initialize method of
  XMPPStatusView
This commit is contained in:
ichim-david 2013-03-02 09:32:26 +02:00
parent d8e4f848b6
commit c4cafb8c4f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
converse.js
View File

@ -1531,7 +1531,7 @@
} else if (presence_type === 'subscribe') { } else if (presence_type === 'subscribe') {
item = this.getItem(bare_jid); item = this.getItem(bare_jid);
// TODO see which auto_subscribe is seen as unresolved variable // TODO see if auto_subscribe is truly an unresolved variable
if (xmppchat.auto_subscribe) { if (xmppchat.auto_subscribe) {
if ((!item) || (item.get('subscription') != 'to')) { if ((!item) || (item.get('subscription') != 'to')) {
if (xmppchat.connection.roster.findItem(bare_jid)) { if (xmppchat.connection.roster.findItem(bare_jid)) {
@ -1633,8 +1633,8 @@
delete this.rosteritemviews[item.id]; delete this.rosteritemviews[item.id];
}, this); }, this);
this.$el.hide(); this.$el.hide()
this.$el.html(this.template()); .html(this.template());
}, },
template: _.template('<dt id="xmpp-contact-requests">Contact requests</dt>' + template: _.template('<dt id="xmpp-contact-requests">Contact requests</dt>' +
@ -1843,6 +1843,8 @@
var $select = this.$el.find('select#select-xmpp-status'), var $select = this.$el.find('select#select-xmpp-status'),
presence_type = this.model.getStatus() || 'offline', presence_type = this.model.getStatus() || 'offline',
options = $('option', $select), options = $('option', $select),
$options_target,
options_list = [],
that = this; that = this;
this.$el.html(this.choose_template()); this.$el.html(this.choose_template());
this.$el.find('#fancy-xmpp-status-select') this.$el.find('#fancy-xmpp-status-select')
@ -1850,13 +1852,15 @@
'status_message': "I am " + presence_type, 'status_message': "I am " + presence_type,
'presence_type': presence_type 'presence_type': presence_type
})); }));
// iterate through all the <option> elements and create UL // iterate through all the <option> elements and add option values
options.each(function(){ options.each(function(){
$(that.el).find("#target dd ul").append(that.option_template({ options_list.push(that.option_template({
'value': $(this).val(), 'value': $(this).val(),
'text': $(this).text() 'text': $(this).text()
})).hide(); }));
}); });
$options_target = this.$el.find("#target dd ul").hide();
$options_target.append(options_list.join(''));
$select.remove(); $select.remove();
// Listen for status change on the model and initialize // Listen for status change on the model and initialize