From 582f0a8b3ed47c228fd085631165c6bb05a4eaa5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Apr 2017 15:45:16 +0300 Subject: [PATCH] [SSE + SSE mobile] Update for underscore 1.8.3. --- apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js | 6 +++--- apps/spreadsheeteditor/main/app/view/CellRangeDialog.js | 2 +- apps/spreadsheeteditor/main/app/view/FormulaDialog.js | 2 +- .../main/app/view/HyperlinkSettingsDialog.js | 2 +- apps/spreadsheeteditor/main/app/view/SetValueDialog.js | 2 +- apps/spreadsheeteditor/main/app/view/Statusbar.js | 8 ++++---- .../spreadsheeteditor/main/app/view/TableOptionsDialog.js | 2 +- apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js | 4 ++-- apps/spreadsheeteditor/mobile/app/view/add/AddLink.js | 4 ++-- apps/spreadsheeteditor/mobile/app/view/add/AddOther.js | 3 +-- apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js | 2 +- apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js | 2 +- 12 files changed, 19 insertions(+), 20 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js index c0c2fa909..e1500b78b 100644 --- a/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js +++ b/apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js @@ -93,7 +93,7 @@ define([ this.handler = options.handler; 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); }, @@ -342,7 +342,7 @@ define([ this.api = options.api; this.handler = options.handler; - _options.tpl = _.template(this.template, _options); + _options.tpl = _.template(this.template)(_options); Common.UI.Window.prototype.initialize.call(this, _options); }, @@ -516,7 +516,7 @@ define([ this.throughIndexes = []; this.filteredIndexes = []; - _options.tpl = _.template(this.template, _options); + _options.tpl = _.template(this.template)(_options); Common.UI.Window.prototype.initialize.call(this, _options); }, diff --git a/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js b/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js index dc36bcd89..b8a91cb4e 100644 --- a/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/CellRangeDialog.js @@ -69,7 +69,7 @@ define([ '' ].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); }, diff --git a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js index 55dd6d9d8..a6bdf7a8a 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaDialog.js @@ -92,7 +92,7 @@ define([ this.formulasGroups = options.formulasGroups; this.handler = options.handler; - _options.tpl = _.template(this.template, _options); + _options.tpl = _.template(this.template)(_options); Common.UI.Window.prototype.initialize.call(this, _options); }, diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 0a9468a35..1a65109df 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -99,7 +99,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.api = this.options.api; Common.UI.Window.prototype.initialize.call(this, this.options); diff --git a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js index 94aac612e..50fdfe928 100644 --- a/apps/spreadsheeteditor/main/app/view/SetValueDialog.js +++ b/apps/spreadsheeteditor/main/app/view/SetValueDialog.js @@ -67,7 +67,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.startvalue = this.options.startvalue; this.maxvalue = this.options.maxvalue; this.defaultUnit = this.options.defaultUnit; diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index c9a0223f4..4086b3e9a 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -68,7 +68,7 @@ define([ templateUserList: _.template(''), @@ -489,7 +489,7 @@ define([ _onAddUser: function(m, c, opts) { 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}); } }, @@ -706,7 +706,7 @@ define([ label: this.labelSheetName, 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); }, @@ -823,7 +823,7 @@ define([ label: options.ismove ? this.textMoveBefore : this.textCopyBefore, 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); }, diff --git a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js index c4dc0a4e4..023fd5bc3 100644 --- a/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/TableOptionsDialog.js @@ -72,7 +72,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.checkRangeType = Asc.c_oAscSelectionDialogType.FormatTable; this.selectionType = Asc.c_oAscSelectionType.RangeCells; diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js index dea71b678..684c4d5da 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js @@ -57,7 +57,7 @@ define([ }; _.extend(_params, args); - var $content = $('
').append(_.template(this.template, _params)); + var $content = $('
').append(_.template(this.template)(_params)); // Android fix for navigation if (Framework7.prototype.device.android) { @@ -121,7 +121,7 @@ define([ 'Logical': me.sCatLogical }; - me.layout = $('
').append(_.template(me.template, { + me.layout = $('
').append(_.template(me.template)({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), textGroups : me.textGroups, diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js index de2d9ac1e..d73083cab 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js @@ -210,7 +210,7 @@ define([ '<% }) %>'; this.layout.find('#add-link-sheet select').html( - _.template(tpl, { + _.template(tpl)({ worksheets: sheets }) ); @@ -219,7 +219,7 @@ define([ if ($view.length > 0) { $view.find('#add-link-sheet select').html( - _.template(tpl, { + _.template(tpl)({ worksheets: sheets }) ); diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js index efed7228c..6c14be0ff 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js @@ -76,8 +76,7 @@ define([ } mapNavigation = - el = _.template(tplNavigation, - { + el = _.template(tplNavigation)({ android : Common.SharedSettings.get('android'), phone : Common.SharedSettings.get('phone'), textBack : this.textBack, diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js index 5164c86f9..ba5a83ea7 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js @@ -133,7 +133,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ styles: styles, styleSize: styleSize }); diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js index dadda1dc3..e1ed91813 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js @@ -160,7 +160,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ styles: styles });