From cfe8cdab30ed1b75f09dd37bcb13c2a4b3edfd80 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 29 Oct 2021 18:33:03 +0300 Subject: [PATCH] Refactoring tips: add "closable" parameter --- apps/common/main/lib/component/SynchronizeTip.js | 5 ++++- .../forms/app/controller/ApplicationController.js | 1 + apps/documenteditor/main/app/controller/FormsTab.js | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/SynchronizeTip.js b/apps/common/main/lib/component/SynchronizeTip.js index a29c32ac39..6c7c170e8e 100644 --- a/apps/common/main/lib/component/SynchronizeTip.js +++ b/apps/common/main/lib/component/SynchronizeTip.js @@ -45,7 +45,8 @@ define([ text : '', placement: 'right-bottom', showLink: true, - showButton: false + showButton: false, + closable: true }, template: _.template([ @@ -54,7 +55,9 @@ define([ '
', '
', '
<%= scope.text %>
', + '<% if ( scope.closable ) { %>', '
', + '<% } %>', '
', '<% if ( scope.showLink ) { %>', '', diff --git a/apps/documenteditor/forms/app/controller/ApplicationController.js b/apps/documenteditor/forms/app/controller/ApplicationController.js index 7985f3dbca..4d739d38ee 100644 --- a/apps/documenteditor/forms/app/controller/ApplicationController.js +++ b/apps/documenteditor/forms/app/controller/ApplicationController.js @@ -1250,6 +1250,7 @@ define([ target: this.view.btnSubmit.$el, text: this.textRequired, showLink: false, + closable: false, showButton: true, textButton: this.textGotIt }); diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 9865320bb6..a9572464b7 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -373,6 +373,7 @@ define([ target: target, text: this.view.textCreateForm, showLink: true + closable: false, }); tip.on({ 'dontshowclick': function() {