Commit 8c780642 authored by JC Brand's avatar JC Brand

Work around undefined jarnxmpp for now. Properly define underscore.string

parent ac07c013
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
define([ define([
"Libraries/burry.js/burry", "Libraries/burry.js/burry",
"Libraries/underscore", "Libraries/underscore.string",
"Libraries/sjcl", "Libraries/sjcl",
"Libraries/backbone", "Libraries/backbone",
"Libraries/strophe.muc", "Libraries/strophe.muc",
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
evaluate : /\{\[([\s\S]+?)\]\}/g, evaluate : /\{\[([\s\S]+?)\]\}/g,
interpolate : /\{\{([\s\S]+?)\}\}/g interpolate : /\{\{([\s\S]+?)\}\}/g
}; };
return factory(jarnxmpp, jQuery, store, _, console); return factory({}, jQuery, store, _, console);
} }
); );
} else { } else {
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
evaluate : /\{\[([\s\S]+?)\]\}/g, evaluate : /\{\[([\s\S]+?)\]\}/g,
interpolate : /\{\{([\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) { }(this, function (jarnxmpp, $, store, _, console) {
...@@ -436,6 +436,7 @@ ...@@ -436,6 +436,7 @@
'placeholder="Personal message"/>'+ 'placeholder="Personal message"/>'+
'</form>'), '</form>'),
render: function () { render: function () {
$(this.el).attr('id', this.model.get('box_id')); $(this.el).attr('id', this.model.get('box_id'));
$(this.el).html(this.template(this.model.toJSON())); $(this.el).html(this.template(this.model.toJSON()));
......
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