From 9bd28ddc0d289a7054f8fd68c3572a3d812cf734 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 24 Nov 2023 20:38:23 +0300 Subject: [PATCH 1/2] [PDF] Hide transparent color for highlight/underline/strikeout --- apps/pdfeditor/main/app/view/Toolbar.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index 7cd7b2d571..d5415eba39 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -532,10 +532,11 @@ define([ id: 'id-toolbar-menu-' + id + '-color-new', template: _.template('' + button.textNewColor + '') }, - {caption: '--'}, + {caption: '--', visible: false}, mnu = new Common.UI.MenuItem({ caption: this.strMenuNoFill, checkable: true, + visible: false, style: 'padding-left:20px;padding-right:20px;' }) ] From f66b4f1eeae293155061c7035567949eb4d97e4d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 24 Nov 2023 20:39:45 +0300 Subject: [PATCH 2/2] Fix opening txt/csv in embedded viewer --- apps/documenteditor/embed/js/ApplicationController.js | 3 +++ apps/spreadsheeteditor/embed/js/ApplicationController.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 0e7264f0c1..a09f7b5f85 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -702,6 +702,9 @@ DE.ApplicationController = new(function(){ $('#loading-mask').addClass("none-animation"); } onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + } else if (type == Asc.c_oAscAdvancedOptionsID.TXT) { + api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.TXT, advOptions.asc_getRecommendedSettings() || new Asc.asc_CTextOptions()); + onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 1f5d986b0b..8a4e91b537 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -481,6 +481,9 @@ SSE.ApplicationController = new(function(){ if(isCustomLoader) hidePreloader(); else $('#loading-mask').addClass("none-animation"); onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); + } else if (type == Asc.c_oAscAdvancedOptionsID.CSV) { + api && api.asc_setAdvancedOptions(Asc.c_oAscAdvancedOptionsID.CSV, advOptions.asc_getRecommendedSettings() || new Asc.asc_CTextOptions()); + onLongActionEnd(Asc.c_oAscAsyncActionType['BlockInteraction'], LoadingDocument); } }