From 460335b4fce62e4a85f30a9b28487d0ee36253be Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 9 Oct 2019 16:27:21 +0300 Subject: [PATCH] Fix rev. 4725e80119c392c2a42c3b49b272034aa54a7701 ([common] refactoring for components) --- apps/documenteditor/main/app/view/RightMenu.js | 6 ++---- apps/presentationeditor/main/app/view/RightMenu.js | 2 +- apps/spreadsheeteditor/main/app/view/RightMenu.js | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/RightMenu.js b/apps/documenteditor/main/app/view/RightMenu.js index f1b95cc70..69a451c3a 100644 --- a/apps/documenteditor/main/app/view/RightMenu.js +++ b/apps/documenteditor/main/app/view/RightMenu.js @@ -190,8 +190,7 @@ define([ allowMouseEventsOnDisabled: true }); this._settings[Common.Utils.documentSettingsType.MailMerge] = {panel: "id-mail-merge-settings", btn: this.btnMailMerge}; - - this.btnMailMerge.el = $markup.findById('#id-right-menu-mail-merge'); this.btnMailMerge.render().setVisible(true); + this.btnMailMerge.setElement($markup.findById('#id-right-menu-mail-merge'), false); this.btnMailMerge.render().setVisible(true); this.btnMailMerge.on('click', this.onBtnMenuClick.bind(this)); this.mergeSettings = new DE.Views.MailMergeSettings(); } @@ -206,8 +205,7 @@ define([ allowMouseEventsOnDisabled: true }); this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature}; - - this.btnSignature.el = $markup.findById('#id-right-menu-signature'); this.btnSignature.render().setVisible(true); + this.btnSignature.setElement($markup.findById('#id-right-menu-signature'), false); this.btnSignature.render().setVisible(true); this.btnSignature.on('click', this.onBtnMenuClick.bind(this)); this.signatureSettings = new DE.Views.SignatureSettings(); } diff --git a/apps/presentationeditor/main/app/view/RightMenu.js b/apps/presentationeditor/main/app/view/RightMenu.js index 58462c338..bfe50a2a5 100644 --- a/apps/presentationeditor/main/app/view/RightMenu.js +++ b/apps/presentationeditor/main/app/view/RightMenu.js @@ -191,7 +191,7 @@ define([ }); this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature}; - this.btnSignature.el = $('#id-right-menu-signature'); this.btnSignature.render().setVisible(true); + this.btnSignature.setElement($('#id-right-menu-signature'), false); this.btnSignature.render().setVisible(true); this.btnSignature.on('click', _.bind(this.onBtnMenuClick, this)); this.signatureSettings = new PE.Views.SignatureSettings(); } diff --git a/apps/spreadsheeteditor/main/app/view/RightMenu.js b/apps/spreadsheeteditor/main/app/view/RightMenu.js index 1706af412..f252e0fd9 100644 --- a/apps/spreadsheeteditor/main/app/view/RightMenu.js +++ b/apps/spreadsheeteditor/main/app/view/RightMenu.js @@ -207,7 +207,7 @@ define([ }); this._settings[Common.Utils.documentSettingsType.Signature] = {panel: "id-signature-settings", btn: this.btnSignature}; - this.btnSignature.el = $('#id-right-menu-signature'); this.btnSignature.render().setVisible(true); + this.btnSignature.setElement($('#id-right-menu-signature'), false); this.btnSignature.render().setVisible(true); this.btnSignature.on('click', _.bind(this.onBtnMenuClick, this)); this.signatureSettings = new SSE.Views.SignatureSettings(); }