From 664fae40e5e87d876e3242366176658ebad55466 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 20 Mar 2020 15:29:47 +0300 Subject: [PATCH] [SSE] Get link to the internal range --- apps/common/main/resources/less/window.less | 2 +- .../main/app/controller/DocumentHolder.js | 1 + .../main/app/controller/Main.js | 1 + .../main/app/controller/Toolbar.js | 1 + .../main/app/view/HyperlinkSettingsDialog.js | 66 ++++++++++++++++++- apps/spreadsheeteditor/main/locale/en.json | 2 + 6 files changed, 71 insertions(+), 2 deletions(-) diff --git a/apps/common/main/resources/less/window.less b/apps/common/main/resources/less/window.less index 9bb540b5d..afb367b6a 100644 --- a/apps/common/main/resources/less/window.less +++ b/apps/common/main/resources/less/window.less @@ -258,7 +258,7 @@ line-height: @input-height-base; } - div { + & > div { display: inline-block; } } diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 64ce194ca..23c27740d 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -530,6 +530,7 @@ define([ win = new SSE.Views.HyperlinkSettingsDialog({ api: me.api, + appOptions: me.permissions, handler: handlerDlg }); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 785ed5d4e..e80da27eb 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -351,6 +351,7 @@ define([ this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures; this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings; this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false)); + this.appOptions.canMakeActionLink = this.editorConfig.canMakeActionLink; this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header'); this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '') diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 87b54ceb2..acd2d0651 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -899,6 +899,7 @@ define([ props = cell.asc_getHyperlink(); win = new SSE.Views.HyperlinkSettingsDialog({ api: me.api, + appOptions: me.appOptions, handler: handlerDlg }); diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 4cd64730e..efdd80cf6 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -78,6 +78,13 @@ define([ '