glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix underscore bug (#674)

Browse source 
* Update package.json

* Update ChatView.js
This commit is contained in:
Connor Turland 2016-09-26 20:39:33 -04:00 committed by GitHub
parent c60e103d97
commit 8f0b350a2d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/Metamaps/Views/ChatView.js
View file

@ -8,6 +8,7 @@
import Backbone from 'backbone' import Backbone from 'backbone'
import Autolinker from 'autolinker' import Autolinker from 'autolinker'
import _ from 'lodash' import _ from 'lodash'
import underscore from 'underscore'
// TODO is this line good or bad // TODO is this line good or bad
// Backbone.$ = window.$ // Backbone.$ = window.$
@ -29,12 +30,12 @@ var Private = {
"<div class='clearfloat'></div>" + "<div class='clearfloat'></div>" +
"</div>", "</div>",
templates: function() { templates: function() {
_.templateSettings = { underscore.templateSettings = {
interpolate: /\{\{(.+?)\}\}/g interpolate: /\{\{(.+?)\}\}/g
}; };
this.messageTemplate = _.template(Private.messageHTML); this.messageTemplate = underscore.template(Private.messageHTML);
this.participantTemplate = _.template(Private.participantHTML); this.participantTemplate = underscore.template(Private.participantHTML);
}, },
createElements: function() { createElements: function() {
this.$unread = $('<div class="chat-unread"></div>'); this.$unread = $('<div class="chat-unread"></div>');

1
package.json
View file

@ -26,6 +26,7 @@
"babel-preset-es2015": "6.14.0", "babel-preset-es2015": "6.14.0",
"babel-preset-react": "6.11.1", "babel-preset-react": "6.11.1",
"backbone": "1.0.0", "backbone": "1.0.0",
"underscore": "1.4.4",
"csv-parse": "1.1.7", "csv-parse": "1.1.7",
"lodash": "4.16.1", "lodash": "4.16.1",
"node-uuid": "1.4.7", "node-uuid": "1.4.7",