From fd1700920353d4f624c66f7ec32f7946897c2d1e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 13 Apr 2017 15:07:15 +0300 Subject: [PATCH] [PE + PE mobile] Update for underscore 1.8.3. --- apps/presentationeditor/main/app/view/DocumentPreview.js | 2 +- .../main/app/view/HyperlinkSettingsDialog.js | 2 +- apps/presentationeditor/main/app/view/SlideSizeSettings.js | 2 +- apps/presentationeditor/main/app/view/SlideshowSettings.js | 2 +- apps/presentationeditor/main/app/view/Statusbar.js | 4 ++-- apps/presentationeditor/mobile/app/view/add/AddSlide.js | 2 +- apps/presentationeditor/mobile/app/view/edit/EditChart.js | 2 +- apps/presentationeditor/mobile/app/view/edit/EditSlide.js | 6 +++--- apps/presentationeditor/mobile/app/view/edit/EditTable.js | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentPreview.js b/apps/presentationeditor/main/app/view/DocumentPreview.js index 39119c2e8..3db0f8d63 100644 --- a/apps/presentationeditor/main/app/view/DocumentPreview.js +++ b/apps/presentationeditor/main/app/view/DocumentPreview.js @@ -100,7 +100,7 @@ define([ render: function () { var el = $(this.el), me = this; - el.html(_.template(this.template, { + el.html(_.template(this.template)({ scope: this })); diff --git a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js index 6561093d6..4d79ef530 100644 --- a/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/presentationeditor/main/app/view/HyperlinkSettingsDialog.js @@ -103,7 +103,7 @@ define([ '' ].join(''); - this.options.tpl = _.template(this.template, this.options); + this.options.tpl = _.template(this.template)(this.options); this.slides = this.options.slides; this.api = this.options.api; diff --git a/apps/presentationeditor/main/app/view/SlideSizeSettings.js b/apps/presentationeditor/main/app/view/SlideSizeSettings.js index 09a499c65..77ec2b563 100644 --- a/apps/presentationeditor/main/app/view/SlideSizeSettings.js +++ b/apps/presentationeditor/main/app/view/SlideSizeSettings.js @@ -87,7 +87,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/presentationeditor/main/app/view/SlideshowSettings.js b/apps/presentationeditor/main/app/view/SlideshowSettings.js index d0ce309c2..41bc3ef22 100644 --- a/apps/presentationeditor/main/app/view/SlideshowSettings.js +++ b/apps/presentationeditor/main/app/view/SlideshowSettings.js @@ -68,7 +68,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/presentationeditor/main/app/view/Statusbar.js b/apps/presentationeditor/main/app/view/Statusbar.js index 6723eae1f..0350076d5 100644 --- a/apps/presentationeditor/main/app/view/Statusbar.js +++ b/apps/presentationeditor/main/app/view/Statusbar.js @@ -80,7 +80,7 @@ define([ templateUserList: _.template(''), @@ -338,7 +338,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}); } }, diff --git a/apps/presentationeditor/mobile/app/view/add/AddSlide.js b/apps/presentationeditor/mobile/app/view/add/AddSlide.js index 91b5bef04..b2984c9ed 100644 --- a/apps/presentationeditor/mobile/app/view/add/AddSlide.js +++ b/apps/presentationeditor/mobile/app/view/add/AddSlide.js @@ -123,7 +123,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ layouts: layouts }); diff --git a/apps/presentationeditor/mobile/app/view/edit/EditChart.js b/apps/presentationeditor/mobile/app/view/edit/EditChart.js index 63cee3905..7508662d9 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditChart.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditChart.js @@ -203,7 +203,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ styles: styles }); diff --git a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js index 38ed167df..3acc66e2b 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js @@ -235,7 +235,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ layouts: layouts }); @@ -268,7 +268,7 @@ define([ '<% }); %>', '', '<% }); %>' - ].join(''), { + ].join(''))({ themes: themes }); @@ -291,7 +291,7 @@ define([ '', '', '<% }); %>' - ].join(''), { + ].join(''))({ android : Common.SharedSettings.get('android'), types: _arrCurrentEffectTypes }); diff --git a/apps/presentationeditor/mobile/app/view/edit/EditTable.js b/apps/presentationeditor/mobile/app/view/edit/EditTable.js index aa922581b..d0cf8c92a 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditTable.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditTable.js @@ -138,7 +138,7 @@ define([ '', '<% }); %>', '' - ].join(''), { + ].join(''))({ styles: styles });