Commit bd053831 authored by Julia Radzhabova's avatar Julia Radzhabova

[Common] Update for underscore 1.8.3.

parent 6b1a247e
......@@ -547,7 +547,7 @@ define([
'<% _.each(items, function(item) { %>',
'<li id="<%= item.id %>" data-value="<%= item.value %>"><a tabindex="-1" type="menuitem"><%= scope.getDisplayValue(item) %></a></li>',
'<% }); %>'
].join(''), {
].join(''))({
items: this.store.toJSON(),
scope: this
}));
......
......@@ -353,7 +353,7 @@ define([
'<li id="<%= item.id %>">',
'<a class="font-item" tabindex="-1" type="menuitem" style="vertical-align:middle; margin: 0 0 0 -10px; height:<%=scope.getListItemHeight()%>px;"/>',
'</li>'
].join(''), {
].join(''))({
item: item.attributes,
scope: this
}));
......
......@@ -421,7 +421,7 @@ define([
_.extend(options, {
cls: 'alert',
onprimary: onKeyDown,
tpl: _.template(template, options)
tpl: _.template(template)(options)
});
var win = new Common.UI.Window(options),
......@@ -556,7 +556,7 @@ define([
render : function() {
var renderto = this.initConfig.renderTo || document.body;
$(renderto).append(
_.template(template, this.initConfig)
_.template(template)(this.initConfig)
);
this.$window = $('#' + this.initConfig.id);
......
......@@ -71,7 +71,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this.toggleGroup = _options.toggleGroup;
......
......@@ -67,7 +67,7 @@ define([
templateUserList: _.template('<ul>' +
'<% _.each(users, function(item) { %>' +
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
......@@ -82,7 +82,7 @@ define([
templateMsgList: _.template('<ul>' +
'<% _.each(messages, function(item) { %>' +
'<%= _.template(msgtpl, {msg: item, scope: scope}) %>' +
'<%= _.template(msgtpl)({msg: item, scope: scope}) %>' +
'<% }); %>' +
'</ul>'),
......@@ -162,7 +162,7 @@ define([
_onAddUser: function(m, c, opts) {
if (this.panelUsers) {
this.panelUsers.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
this.panelUsers.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
this.panelUsers.scroller.update({minScrollbarLength : 25, alwaysVisibleY: true});
}
},
......@@ -186,7 +186,7 @@ define([
var content = this.panelMessages.find('ul');
if (content && content.length) {
this._prepareMessage(m);
content.append(_.template(this.tplMsg, {msg: m, scope: this}));
content.append(_.template(this.tplMsg)({msg: m, scope: this}));
// scroll to end
......
......@@ -98,7 +98,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};
......
......@@ -83,7 +83,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
......
......@@ -57,7 +57,7 @@ define([
'<div id="id-sharing-placeholder"></div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.settingsurl = options.settingsurl || '';
Common.UI.Window.prototype.initialize.call(this, _options);
......
......@@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._chartData = null;
......
......@@ -66,7 +66,7 @@ define([
'</div>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.handler = _options.handler;
this._mergeData = null;
......
......@@ -65,7 +65,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
......
......@@ -73,7 +73,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
......
......@@ -93,7 +93,7 @@ define([
this.codepages = options.codepages;
this.settings = options.settings;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
Common.UI.Window.prototype.initialize.call(this, _options);
},
......
......@@ -225,7 +225,7 @@ define([
'<% } %>'
].join('');
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.url = options.url || '';
Common.UI.Window.prototype.initialize.call(this, _options);
......
......@@ -66,7 +66,7 @@ define([
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
......
......@@ -80,7 +80,7 @@ define([
this.store = options.store;
this.delegate = options.delegate;
_options.tpl = _.template(this.template, _options);
_options.tpl = _.template(this.template)(_options);
this.arrow = {margin: 20, width: 12, height: 34};
this.sdkBounds = {width: 0, height: 0, padding: 10, paddingTop: 20};
......@@ -441,7 +441,7 @@ define([
var el = $(this.el),
me = this;
el.addClass('review-changes');
el.html(_.template(this.template, {
el.html(_.template(this.template)({
scope: this
}));
......
......@@ -105,7 +105,7 @@
'</div>'
].join('');
this.options.tpl = _.template(this.template, this.options);
this.options.tpl = _.template(this.template)(this.options);
Common.UI.Window.prototype.initialize.call(this, this.options);
},
......
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