From ee04cee58330043fb149fdee8c6f9107b88fc1a6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 16 Jan 2023 12:44:58 +0300 Subject: [PATCH 1/8] [SSE] Send path value for external links --- apps/spreadsheeteditor/main/app/controller/DataTab.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js index 2b1f430033..2804888d6c 100644 --- a/apps/spreadsheeteditor/main/app/controller/DataTab.js +++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js @@ -523,7 +523,10 @@ define([ data = {path: item.asc_getData()}; break; case Asc.c_oAscExternalReferenceType.referenceData: - data = {referenceData: item.asc_getData()}; + data = { + referenceData: item.asc_getData(), + path: item.asc_getPath() + }; break; } data && me.externalData.stackRequests.push({data: data, id: item.asc_getId(), isExternal: item.asc_isExternalLink()}); From b86867d54f0c83cddc65e09a677ce99bebdb7e78 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 16 Jan 2023 12:45:23 +0300 Subject: [PATCH 2/8] [SSE] Show warning when paste external data --- apps/spreadsheeteditor/main/app/controller/DataTab.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js index 2804888d6c..b173e4180d 100644 --- a/apps/spreadsheeteditor/main/app/controller/DataTab.js +++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js @@ -589,9 +589,7 @@ define([ }, onNeedUpdateExternalReference: function() { - var val = Common.localStorage.getBool("sse-hide-add-external-warn"); - !val && Common.NotificationCenter.trigger('showmessage', {msg: this.textAddExternalData}); - Common.localStorage.setBool("sse-hide-add-external-warn", true); + Common.NotificationCenter.trigger('showmessage', {msg: this.textAddExternalData}); }, onWorksheetLocked: function(index,locked) { From fbc77933a6b606a210b9e19c4a21da2356ed331f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 16 Jan 2023 22:30:21 +0300 Subject: [PATCH 3/8] For Bug 60590 --- apps/documenteditor/main/app/controller/FormsTab.js | 6 ++++-- apps/documenteditor/main/app/view/FormSettings.js | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index 30b1c1f9aa..ee5b1a1148 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -201,11 +201,13 @@ define([ } else if (type == 'combobox' || type == 'dropdown') this.api.asc_AddContentControlList(type == 'combobox', oPr, oFormPr); else if (type == 'datetime'){ - var props = new AscCommon.CContentControlPr(); + var props = new AscCommon.CContentControlPr(), + datePr = new AscCommon.CSdtDatePickerPr(); oPr = new AscCommon.CSdtTextFormPr(); props.put_TextFormPr(oPr); props.put_FormPr(oFormPr); - props.put_DateTimePr(new AscCommon.CSdtDatePickerPr()); + props.put_DateTimePr(datePr); + props.put_PlaceholderText(datePr.get_String()); this.api.asc_AddContentControlDatePicker(props); } else if (type == 'text') { var props = new AscCommon.CContentControlPr(); diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index d00ee35a71..3b607d308b 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -1482,7 +1482,7 @@ define([ } this.updateDateFormats(this.cmbLang.getValue()); var format = datePr.get_DateFormat(); - this.cmbDateFormat.setValue(format); + this.cmbDateFormat.setValue(format, datePr.get_String()); this._state.DateFormat=format; } @@ -1770,6 +1770,7 @@ define([ formDatePr.put_DateFormat(this.cmbDateFormat.getValue()); formDatePr.put_LangId(this.cmbLang.getValue()); props.put_DateTimePr(formDatePr); + props.put_PlaceholderText(formDatePr.get_String()); this.api.asc_SetContentControlProperties(props, this.internalId); this.fireEvent('editcomplete', this); } else { From d38a6099cea02670345739f9d8b744c6e5e70655 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 16 Jan 2023 22:35:14 +0300 Subject: [PATCH 4/8] [DE] Fix datetime form settings --- apps/documenteditor/main/app/view/FormSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/FormSettings.js b/apps/documenteditor/main/app/view/FormSettings.js index 3b607d308b..a350c0c04d 100644 --- a/apps/documenteditor/main/app/view/FormSettings.js +++ b/apps/documenteditor/main/app/view/FormSettings.js @@ -645,7 +645,7 @@ define([ cls: 'input-group-nr', menuCls: 'menu-absolute', menuStyle: 'min-width: 195px; max-height: 190px;', - editable: true, + editable: false, data: [], dataHint: '1', dataHintDirection: 'bottom', From 8529d0828b9f6f42fb367d524461c5615095aef8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 17 Jan 2023 13:21:57 +0300 Subject: [PATCH 5/8] [SSE] Fix special paste menu --- .../main/app/controller/DocumentHolder.js | 3 +++ apps/spreadsheeteditor/main/resources/less/toolbar.less | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 316b1fceb7..1c6d27d54f 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -3264,10 +3264,13 @@ define([ Common.util.Shortcuts.delegateShortcuts({shortcuts:keymap}); Common.util.Shortcuts.suspendEvents(str, undefined, true); + var pasteContainer = me.documentHolder.cmpEl.find('#special-paste-container'); me.btnSpecialPaste.menu.on('show:after', function(menu) { Common.util.Shortcuts.resumeEvents(str); + pasteContainer.addClass('has-open-menu'); }).on('hide:after', function(menu) { Common.util.Shortcuts.suspendEvents(str, undefined, true); + pasteContainer.removeClass('has-open-menu'); }); }, diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 12f305893e..bd1dd4647f 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -116,6 +116,10 @@ background-color: @background-toolbar; border: @scaled-one-px-value-ie solid @border-regular-control-ie; border: @scaled-one-px-value solid @border-regular-control; + + &.has-open-menu { + z-index: @zindex-navbar + 1; + } } #equation-container { @@ -123,9 +127,6 @@ .separator { height: 20px; } - &.has-open-menu { - z-index: @zindex-navbar + 1; - } } #slot-field-fontsize { From f245de48ee6c11a97d000fa8a4936848b592bbc0 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Wed, 18 Jan 2023 01:34:04 +0400 Subject: [PATCH 6/8] [DE PE SSE mobile] Fix Bug 59790 --- apps/documenteditor/mobile/src/controller/add/AddLink.jsx | 7 ++++++- .../mobile/src/controller/add/AddLink.jsx | 7 ++++++- .../mobile/src/controller/add/AddLink.jsx | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx index 7258ecf3fd..349f554b71 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx @@ -59,7 +59,12 @@ class AddLinkController extends Component { props.put_ToolTip(tip); api.add_Hyperlink(props); - this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); + + if(this.props.isNavigate) { + f7.views.current.router.back(); + } else { + this.closeModal(); + } } componentDidMount() { diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx index 2e37adf42e..97e2c836d7 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx @@ -112,7 +112,12 @@ class AddLinkController extends Component { props.put_Text(null); api.add_Hyperlink(props); - this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); + + if(this.props.isNavigate) { + f7.views.current.router.back(); + } else { + this.closeModal(); + } } getTextDisplay () { diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx index 1f086c14ec..0efec2f86b 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx @@ -111,7 +111,12 @@ class AddLinkController extends Component { link.asc_setTooltip(args.tooltip); api.asc_insertHyperlink(link); - this.props.isNavigate && !Device.phone ? f7.views.current.router.back() : this.closeModal(); + + if(this.props.isNavigate) { + f7.views.current.router.back(); + } else { + this.closeModal(); + } } closeModal () { From d975f79dd60d400c91e4b390549ed4dc6aba7bb6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 18 Jan 2023 12:47:16 +0300 Subject: [PATCH 7/8] [DE] Don't close right panel when view form mode is turned on. --- apps/documenteditor/main/app/controller/FormsTab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/FormsTab.js b/apps/documenteditor/main/app/controller/FormsTab.js index ee5b1a1148..65d4325af3 100644 --- a/apps/documenteditor/main/app/controller/FormsTab.js +++ b/apps/documenteditor/main/app/controller/FormsTab.js @@ -356,7 +356,7 @@ define([ allowMerge: false, allowSignature: false, allowProtect: false, - rightMenu: {clear: disable, disable: true}, + rightMenu: {clear: false, disable: true}, statusBar: true, leftMenu: {disable: false, previewMode: true}, fileMenu: {info: true}, From ea4188a70601f11ec50152e121e38bc77c40e8c1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 19 Jan 2023 13:34:55 +0300 Subject: [PATCH 8/8] For Bug 42393: fix description on mac os --- apps/documenteditor/main/app/controller/DocumentHolder.js | 2 +- apps/presentationeditor/main/app/controller/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 2c63f28020..244c3c1b82 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -1127,7 +1127,7 @@ define([ parentEl: $('#id-document-holder-btn-special-paste'), cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-paste', - caption : Common.Utils.String.platformKey('Ctrl', '({0})'), + caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl), menu : new Common.UI.Menu({items: []}) }); me.initSpecialPasteEvents(); diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index d4329bf28f..f8bad5baff 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -1213,7 +1213,7 @@ define([ parentEl: $('#id-document-holder-btn-special-paste'), cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-paste', - caption : Common.Utils.String.platformKey('Ctrl', '({0})'), + caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl), menu : new Common.UI.Menu({items: []}) }); me.initSpecialPasteEvents(); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 1c6d27d54f..fc2c70e87e 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -3046,7 +3046,7 @@ define([ parentEl: $('#id-document-holder-btn-special-paste'), cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-paste', - caption : Common.Utils.String.platformKey('Ctrl', '({0})'), + caption : Common.Utils.String.format('({0})', Common.Utils.String.textCtrl), menu : new Common.UI.Menu({items: []}) }); me.initSpecialPasteEvents();