[SSE + SSE mobile] Update for underscore 1.8.3.
This commit is contained in:
parent
fd17009203
commit
582f0a8b3e
|
@ -93,7 +93,7 @@ define([
|
||||||
this.handler = options.handler;
|
this.handler = options.handler;
|
||||||
this.type = options.type || 'number';
|
this.type = options.type || 'number';
|
||||||
|
|
||||||
_options.tpl = _.template(this.template, _options);
|
_options.tpl = _.template(this.template)(_options);
|
||||||
|
|
||||||
Common.UI.Window.prototype.initialize.call(this, _options);
|
Common.UI.Window.prototype.initialize.call(this, _options);
|
||||||
},
|
},
|
||||||
|
@ -342,7 +342,7 @@ define([
|
||||||
this.api = options.api;
|
this.api = options.api;
|
||||||
this.handler = options.handler;
|
this.handler = options.handler;
|
||||||
|
|
||||||
_options.tpl = _.template(this.template, _options);
|
_options.tpl = _.template(this.template)(_options);
|
||||||
|
|
||||||
Common.UI.Window.prototype.initialize.call(this, _options);
|
Common.UI.Window.prototype.initialize.call(this, _options);
|
||||||
},
|
},
|
||||||
|
@ -516,7 +516,7 @@ define([
|
||||||
this.throughIndexes = [];
|
this.throughIndexes = [];
|
||||||
this.filteredIndexes = [];
|
this.filteredIndexes = [];
|
||||||
|
|
||||||
_options.tpl = _.template(this.template, _options);
|
_options.tpl = _.template(this.template)(_options);
|
||||||
|
|
||||||
Common.UI.Window.prototype.initialize.call(this, _options);
|
Common.UI.Window.prototype.initialize.call(this, _options);
|
||||||
},
|
},
|
||||||
|
|
|
@ -69,7 +69,7 @@ define([
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('');
|
].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);
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
},
|
},
|
||||||
|
|
|
@ -92,7 +92,7 @@ define([
|
||||||
this.formulasGroups = options.formulasGroups;
|
this.formulasGroups = options.formulasGroups;
|
||||||
this.handler = options.handler;
|
this.handler = options.handler;
|
||||||
|
|
||||||
_options.tpl = _.template(this.template, _options);
|
_options.tpl = _.template(this.template)(_options);
|
||||||
|
|
||||||
Common.UI.Window.prototype.initialize.call(this, _options);
|
Common.UI.Window.prototype.initialize.call(this, _options);
|
||||||
},
|
},
|
||||||
|
|
|
@ -99,7 +99,7 @@ define([
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('');
|
].join('');
|
||||||
|
|
||||||
this.options.tpl = _.template(this.template, this.options);
|
this.options.tpl = _.template(this.template)(this.options);
|
||||||
this.api = this.options.api;
|
this.api = this.options.api;
|
||||||
|
|
||||||
Common.UI.Window.prototype.initialize.call(this, this.options);
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
|
|
|
@ -67,7 +67,7 @@ define([
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('');
|
].join('');
|
||||||
|
|
||||||
this.options.tpl = _.template(this.template, this.options);
|
this.options.tpl = _.template(this.template)(this.options);
|
||||||
this.startvalue = this.options.startvalue;
|
this.startvalue = this.options.startvalue;
|
||||||
this.maxvalue = this.options.maxvalue;
|
this.maxvalue = this.options.maxvalue;
|
||||||
this.defaultUnit = this.options.defaultUnit;
|
this.defaultUnit = this.options.defaultUnit;
|
||||||
|
|
|
@ -68,7 +68,7 @@ define([
|
||||||
|
|
||||||
templateUserList: _.template('<ul>' +
|
templateUserList: _.template('<ul>' +
|
||||||
'<% _.each(users, function(item) { %>' +
|
'<% _.each(users, function(item) { %>' +
|
||||||
'<%= _.template(usertpl, {user: item, scope: scope}) %>' +
|
'<%= _.template(usertpl)({user: item, scope: scope}) %>' +
|
||||||
'<% }); %>' +
|
'<% }); %>' +
|
||||||
'</ul>'),
|
'</ul>'),
|
||||||
|
|
||||||
|
@ -489,7 +489,7 @@ define([
|
||||||
|
|
||||||
_onAddUser: function(m, c, opts) {
|
_onAddUser: function(m, c, opts) {
|
||||||
if (this.panelUsersList) {
|
if (this.panelUsersList) {
|
||||||
this.panelUsersList.find('ul').append(_.template(this.tplUser, {user: m, scope: this}));
|
this.panelUsersList.find('ul').append(_.template(this.tplUser)({user: m, scope: this}));
|
||||||
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
|
this.panelUsersList.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -706,7 +706,7 @@ define([
|
||||||
label: this.labelSheetName,
|
label: this.labelSheetName,
|
||||||
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
|
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
|
||||||
});
|
});
|
||||||
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);
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
},
|
},
|
||||||
|
@ -823,7 +823,7 @@ define([
|
||||||
label: options.ismove ? this.textMoveBefore : this.textCopyBefore,
|
label: options.ismove ? this.textMoveBefore : this.textCopyBefore,
|
||||||
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
|
btns: {ok: this.okButtonText, cancel: this.cancelButtonText}
|
||||||
});
|
});
|
||||||
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);
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
},
|
},
|
||||||
|
|
|
@ -72,7 +72,7 @@ define([
|
||||||
'</div>'
|
'</div>'
|
||||||
].join('');
|
].join('');
|
||||||
|
|
||||||
this.options.tpl = _.template(this.template, this.options);
|
this.options.tpl = _.template(this.template)(this.options);
|
||||||
this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable;
|
this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable;
|
||||||
this.selectionType = Asc.c_oAscSelectionType.RangeCells;
|
this.selectionType = Asc.c_oAscSelectionType.RangeCells;
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ define([
|
||||||
};
|
};
|
||||||
|
|
||||||
_.extend(_params, args);
|
_.extend(_params, args);
|
||||||
var $content = $('<div/>').append(_.template(this.template, _params));
|
var $content = $('<div/>').append(_.template(this.template)(_params));
|
||||||
|
|
||||||
// Android fix for navigation
|
// Android fix for navigation
|
||||||
if (Framework7.prototype.device.android) {
|
if (Framework7.prototype.device.android) {
|
||||||
|
@ -121,7 +121,7 @@ define([
|
||||||
'Logical': me.sCatLogical
|
'Logical': me.sCatLogical
|
||||||
};
|
};
|
||||||
|
|
||||||
me.layout = $('<div/>').append(_.template(me.template, {
|
me.layout = $('<div/>').append(_.template(me.template)({
|
||||||
android : Common.SharedSettings.get('android'),
|
android : Common.SharedSettings.get('android'),
|
||||||
phone : Common.SharedSettings.get('phone'),
|
phone : Common.SharedSettings.get('phone'),
|
||||||
textGroups : me.textGroups,
|
textGroups : me.textGroups,
|
||||||
|
|
|
@ -210,7 +210,7 @@ define([
|
||||||
'<% }) %>';
|
'<% }) %>';
|
||||||
|
|
||||||
this.layout.find('#add-link-sheet select').html(
|
this.layout.find('#add-link-sheet select').html(
|
||||||
_.template(tpl, {
|
_.template(tpl)({
|
||||||
worksheets: sheets
|
worksheets: sheets
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
@ -219,7 +219,7 @@ define([
|
||||||
|
|
||||||
if ($view.length > 0) {
|
if ($view.length > 0) {
|
||||||
$view.find('#add-link-sheet select').html(
|
$view.find('#add-link-sheet select').html(
|
||||||
_.template(tpl, {
|
_.template(tpl)({
|
||||||
worksheets: sheets
|
worksheets: sheets
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
|
@ -76,8 +76,7 @@ define([
|
||||||
}
|
}
|
||||||
|
|
||||||
mapNavigation =
|
mapNavigation =
|
||||||
el = _.template(tplNavigation,
|
el = _.template(tplNavigation)({
|
||||||
{
|
|
||||||
android : Common.SharedSettings.get('android'),
|
android : Common.SharedSettings.get('android'),
|
||||||
phone : Common.SharedSettings.get('phone'),
|
phone : Common.SharedSettings.get('phone'),
|
||||||
textBack : this.textBack,
|
textBack : this.textBack,
|
||||||
|
|
|
@ -133,7 +133,7 @@ define([
|
||||||
'<% }); %>',
|
'<% }); %>',
|
||||||
'</ul>',
|
'</ul>',
|
||||||
'<% }); %>'
|
'<% }); %>'
|
||||||
].join(''), {
|
].join(''))({
|
||||||
styles: styles,
|
styles: styles,
|
||||||
styleSize: styleSize
|
styleSize: styleSize
|
||||||
});
|
});
|
||||||
|
|
|
@ -160,7 +160,7 @@ define([
|
||||||
'<% }); %>',
|
'<% }); %>',
|
||||||
'</ul>',
|
'</ul>',
|
||||||
'<% }); %>'
|
'<% }); %>'
|
||||||
].join(''), {
|
].join(''))({
|
||||||
styles: styles
|
styles: styles
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue