From df965949111accc29d22698e89adb422e97850ff Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Apr 2017 15:04:31 +0300 Subject: [PATCH] [DE + DE mobile] Update for underscore 1.8.3. --- .../documenteditor/main/app/view/HyperlinkSettingsDialog.js | 2 +- apps/documenteditor/main/app/view/MailMergeRecepients.js | 2 +- apps/documenteditor/main/app/view/MailMergeSaveDlg.js | 2 +- apps/documenteditor/main/app/view/PageMarginsDialog.js | 2 +- apps/documenteditor/main/app/view/PageSizeDialog.js | 2 +- apps/documenteditor/main/app/view/Statusbar.js | 6 +++--- apps/documenteditor/main/app/view/StyleTitleDialog.js | 2 +- apps/documenteditor/mobile/app/view/Settings.js | 2 +- apps/documenteditor/mobile/app/view/edit/EditChart.js | 2 +- apps/documenteditor/mobile/app/view/edit/EditTable.js | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js index 335bd1de56..eda22b39d2 100644 --- a/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/documenteditor/main/app/view/HyperlinkSettingsDialog.js @@ -81,7 +81,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/documenteditor/main/app/view/MailMergeRecepients.js b/apps/documenteditor/main/app/view/MailMergeRecepients.js index 1d6421a77f..9135a9886a 100644 --- a/apps/documenteditor/main/app/view/MailMergeRecepients.js +++ b/apps/documenteditor/main/app/view/MailMergeRecepients.js @@ -54,7 +54,7 @@ define([ '
' ].join(''); - _options.tpl = _.template(this.template, _options); + _options.tpl = _.template(this.template)(_options); this.fileChoiceUrl = options.fileChoiceUrl || ''; Common.UI.Window.prototype.initialize.call(this, _options); diff --git a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js index 7158ac5345..3a76f35e65 100644 --- a/apps/documenteditor/main/app/view/MailMergeSaveDlg.js +++ b/apps/documenteditor/main/app/view/MailMergeSaveDlg.js @@ -55,7 +55,7 @@ define([ '
' ].join(''); - _options.tpl = _.template(this.template, _options); + _options.tpl = _.template(this.template)(_options); this.mergeFolderUrl = options.mergeFolderUrl || ''; this.mergedFileUrl = options.mergedFileUrl || ''; diff --git a/apps/documenteditor/main/app/view/PageMarginsDialog.js b/apps/documenteditor/main/app/view/PageMarginsDialog.js index d9fb32f4e7..fcb925a018 100644 --- a/apps/documenteditor/main/app/view/PageMarginsDialog.js +++ b/apps/documenteditor/main/app/view/PageMarginsDialog.js @@ -89,7 +89,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.spinners = []; this._noApply = false; diff --git a/apps/documenteditor/main/app/view/PageSizeDialog.js b/apps/documenteditor/main/app/view/PageSizeDialog.js index 3537e1e3c0..c3f5ac6da0 100644 --- a/apps/documenteditor/main/app/view/PageSizeDialog.js +++ b/apps/documenteditor/main/app/view/PageSizeDialog.js @@ -79,7 +79,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.spinners = []; this._noApply = false; diff --git a/apps/documenteditor/main/app/view/Statusbar.js b/apps/documenteditor/main/app/view/Statusbar.js index 4017ad6a0c..fd3fe1a483 100644 --- a/apps/documenteditor/main/app/view/Statusbar.js +++ b/apps/documenteditor/main/app/view/Statusbar.js @@ -96,7 +96,7 @@ define([ templateUserList: _.template(''), @@ -436,7 +436,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}); } }, @@ -566,7 +566,7 @@ define([ label: this.labelSelect, btns: {ok: this.btnOk, cancel: this.btnCancel} }); - 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/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js index 3e9ff63639..8fd238dd16 100644 --- a/apps/documenteditor/main/app/view/StyleTitleDialog.js +++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js @@ -70,7 +70,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/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index 3abe57f4d9..34d0ef01ac 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -175,7 +175,7 @@ define([ '', '', '' - ].join(''), { + ].join(''))({ android: Framework7.prototype.device.android, item: size, index: index, diff --git a/apps/documenteditor/mobile/app/view/edit/EditChart.js b/apps/documenteditor/mobile/app/view/edit/EditChart.js index 9c6e801510..0eba29262f 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditChart.js +++ b/apps/documenteditor/mobile/app/view/edit/EditChart.js @@ -203,7 +203,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ styles: styles }); diff --git a/apps/documenteditor/mobile/app/view/edit/EditTable.js b/apps/documenteditor/mobile/app/view/edit/EditTable.js index 2f546509b7..172c53ec31 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditTable.js +++ b/apps/documenteditor/mobile/app/view/edit/EditTable.js @@ -138,7 +138,7 @@ define([ '', '<% }); %>', '' - ].join(''), { + ].join(''))({ styles: styles });