From 8c7806425d5e346dbeddd1a2189d7c73fe93351b Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 2 Nov 2012 13:55:12 +0200 Subject: [PATCH] Work around undefined jarnxmpp for now. Properly define underscore.string --- converse.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/converse.js b/converse.js index bd21308cf..8634f6626 100644 --- a/converse.js +++ b/converse.js @@ -42,7 +42,7 @@ define([ "Libraries/burry.js/burry", - "Libraries/underscore", + "Libraries/underscore.string", "Libraries/sjcl", "Libraries/backbone", "Libraries/strophe.muc", @@ -56,7 +56,7 @@ evaluate : /\{\[([\s\S]+?)\]\}/g, interpolate : /\{\{([\s\S]+?)\}\}/g }; - return factory(jarnxmpp, jQuery, store, _, console); + return factory({}, jQuery, store, _, console); } ); } else { @@ -66,7 +66,7 @@ evaluate : /\{\[([\s\S]+?)\]\}/g, interpolate : /\{\{([\s\S]+?)\}\}/g }; - root.xmppchat = factory(jarnxmpp, jQuery, store, _, console || {log: function(){}}); + root.xmppchat = factory({}, jQuery, store, _, console || {log: function(){}}); } }(this, function (jarnxmpp, $, store, _, console) { @@ -436,6 +436,7 @@ 'placeholder="Personal message"/>'+ ''), + render: function () { $(this.el).attr('id', this.model.get('box_id')); $(this.el).html(this.template(this.model.toJSON()));