Commit 9f5f5da7 authored by JC Brand's avatar JC Brand

Created method insertIntoPage

Put the code that inserts a chat box into the page in it's own method,
so that it can be overridden from a plugin.
parent f868917d
...@@ -1026,15 +1026,17 @@ ...@@ -1026,15 +1026,17 @@
this.model.on('showReceivedOTRMessage', function (text) { this.model.on('showReceivedOTRMessage', function (text) {
this.showMessage({'message': text, 'sender': 'them'}); this.showMessage({'message': text, 'sender': 'them'});
}, this); }, this);
this.updateVCard().insertIntoPage();
this.updateVCard();
this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el);
this.hide().render().model.messages.fetch({add: true}); this.hide().render().model.messages.fetch({add: true});
if ((_.contains([UNVERIFIED, VERIFIED], this.model.get('otr_status'))) || converse.use_otr_by_default) { if ((_.contains([UNVERIFIED, VERIFIED], this.model.get('otr_status'))) || converse.use_otr_by_default) {
this.model.initiateOTR(); this.model.initiateOTR();
} }
}, },
insertIntoPage: function () {
this.$el.insertAfter(converse.chatboxviews.get("controlbox").$el);
},
render: function () { render: function () {
this.$el.attr('id', this.model.get('box_id')) this.$el.attr('id', this.model.get('box_id'))
.html(converse.templates.chatbox( .html(converse.templates.chatbox(
...@@ -1503,7 +1505,7 @@ ...@@ -1503,7 +1505,7 @@
}, },
updateVCard: function () { updateVCard: function () {
if (!this.use_vcards) { return; } if (!this.use_vcards) { return this; }
var jid = this.model.get('jid'), var jid = this.model.get('jid'),
contact = converse.roster.get(jid); contact = converse.roster.get(jid);
if ((contact) && (!contact.get('vcard_updated'))) { if ((contact) && (!contact.get('vcard_updated'))) {
...@@ -1522,6 +1524,7 @@ ...@@ -1522,6 +1524,7 @@
} }
); );
} }
return this;
}, },
informOTRChange: function () { informOTRChange: function () {
......
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