From 9911c851c523b369a1eebec41f583857900a0c71 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Mar 2020 11:40:58 +0300 Subject: [PATCH 01/13] Fix translation --- apps/documenteditor/main/locale/fi.json | 2 +- apps/presentationeditor/main/locale/fi.json | 6 +++--- apps/spreadsheeteditor/main/locale/fi.json | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/main/locale/fi.json b/apps/documenteditor/main/locale/fi.json index 508962f5b1..7da94b7ad8 100644 --- a/apps/documenteditor/main/locale/fi.json +++ b/apps/documenteditor/main/locale/fi.json @@ -1122,7 +1122,7 @@ "DE.Views.ImageSettings.textEdit": "Muokkaa", "DE.Views.ImageSettings.textEditObject": "Muokkaa objektia", "DE.Views.ImageSettings.textFromFile": "Tiedostosta", - "DE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta", + "DE.Views.ImageSettings.textFromUrl": "URL-osoitteesta", "DE.Views.ImageSettings.textHeight": "Korkeus", "DE.Views.ImageSettings.textInsert": "Korvaa kuva", "DE.Views.ImageSettings.textOriginalSize": "Oletuskoko", diff --git a/apps/presentationeditor/main/locale/fi.json b/apps/presentationeditor/main/locale/fi.json index b7203c6a1e..3d8d6efd96 100644 --- a/apps/presentationeditor/main/locale/fi.json +++ b/apps/presentationeditor/main/locale/fi.json @@ -949,7 +949,7 @@ "PE.Views.ImageSettings.textEdit": "Muokkaa", "PE.Views.ImageSettings.textEditObject": "Muokkaa objektia", "PE.Views.ImageSettings.textFromFile": "Tiedostosta", - "PE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta", + "PE.Views.ImageSettings.textFromUrl": "URL-osoitteesta", "PE.Views.ImageSettings.textHeight": "Korkeus", "PE.Views.ImageSettings.textInsert": "Korvaa kuva", "PE.Views.ImageSettings.textOriginalSize": "Oletuskoko", @@ -1112,7 +1112,7 @@ "PE.Views.SlideSettings.textEmptyPattern": "Ei kuviota", "PE.Views.SlideSettings.textFade": "Häivytys", "PE.Views.SlideSettings.textFromFile": "Tiedostosta", - "PE.Views.SlideSettings.textFromUrl": "Verkko-osoitteesta", + "PE.Views.SlideSettings.textFromUrl": "URL-osoitteesta", "PE.Views.SlideSettings.textGradient": "Kalteva", "PE.Views.SlideSettings.textGradientFill": "Kalteva täyttö", "PE.Views.SlideSettings.textHorizontalIn": "Sisään vaakasuoraan", @@ -1262,7 +1262,7 @@ "PE.Views.TextArtSettings.textDirection": "Suunta", "PE.Views.TextArtSettings.textEmptyPattern": "Ei kuviota", "PE.Views.TextArtSettings.textFromFile": "Tiedostosta", - "PE.Views.TextArtSettings.textFromUrl": "Verkko-osoitteesta", + "PE.Views.TextArtSettings.textFromUrl": "URL-osoitteesta", "PE.Views.TextArtSettings.textGradient": "Kalteva", "PE.Views.TextArtSettings.textGradientFill": "Kalteva täyttö", "PE.Views.TextArtSettings.textImageTexture": "Kuva tai pintarakenne", diff --git a/apps/spreadsheeteditor/main/locale/fi.json b/apps/spreadsheeteditor/main/locale/fi.json index b4de5b85e4..65a99e21c3 100644 --- a/apps/spreadsheeteditor/main/locale/fi.json +++ b/apps/spreadsheeteditor/main/locale/fi.json @@ -786,7 +786,7 @@ "SSE.Views.ChartSettingsDlg.textHundredMil": "100 000 000", "SSE.Views.ChartSettingsDlg.textHundreds": "Satoja", "SSE.Views.ChartSettingsDlg.textHundredThousands": "100 000", - "SSE.Views.ChartSettingsDlg.textIn": "/", + "SSE.Views.ChartSettingsDlg.textIn": "Sisällä", "SSE.Views.ChartSettingsDlg.textInnerBottom": "Sisäreuna alhaalla", "SSE.Views.ChartSettingsDlg.textInnerTop": "Sisäreuna ylhäällä", "SSE.Views.ChartSettingsDlg.textInvalidRange": "VIRHE! Virheellinen solujen tietoalue", @@ -1050,7 +1050,7 @@ "SSE.Views.ImageSettings.textEdit": "Muokkaa", "SSE.Views.ImageSettings.textEditObject": "Muokkaa objektia", "SSE.Views.ImageSettings.textFromFile": "Tiedostosta", - "SSE.Views.ImageSettings.textFromUrl": "Verkko-osoitteesta", + "SSE.Views.ImageSettings.textFromUrl": "URL-osoitteesta", "SSE.Views.ImageSettings.textHeight": "Korkeus", "SSE.Views.ImageSettings.textInsert": "Korvaa kuva", "SSE.Views.ImageSettings.textKeepRatio": "Vakiosuhteet", @@ -1169,7 +1169,7 @@ "SSE.Views.PrintSettings.textFitCols": "Sovita kaikki sarakkeet yhdelle sivulle", "SSE.Views.PrintSettings.textFitPage": "Sovita taulukko yhdelle sivulle", "SSE.Views.PrintSettings.textFitRows": "Sovita kaikki rivit yhdelle sivulle", - "SSE.Views.PrintSettings.textHideDetails": "Piilota yksityiskohdat", + "SSE.Views.PrintSettings.textHideDetails": "Piilota tiedot", "SSE.Views.PrintSettings.textLayout": "Asettelu", "SSE.Views.PrintSettings.textPageOrientation": "Sivun suunta", "SSE.Views.PrintSettings.textPageScaling": "Skaalaus", @@ -1318,7 +1318,7 @@ "SSE.Views.TableSettings.textIsLocked": "Toinen käyttäjä on muokkaamassa tätä elementtiä. ", "SSE.Views.TableSettings.textLast": "Viimeinen", "SSE.Views.TableSettings.textReservedName": "Nimi, jota yrität käyttää, on jo viitattu solujen kaavoissa. Ole hyvä ja käytä muuta nimeä.", - "SSE.Views.TableSettings.textResize": "Muuta taulukon kokoa", + "SSE.Views.TableSettings.textResize": "Taulukon koko", "SSE.Views.TableSettings.textRows": "Rivit", "SSE.Views.TableSettings.textSelectData": "Valitse tiedot", "SSE.Views.TableSettings.textTableName": "Taulukon nimi", @@ -1338,7 +1338,7 @@ "SSE.Views.TextArtSettings.textDirection": "Suunta", "SSE.Views.TextArtSettings.textEmptyPattern": "Ei kuviota", "SSE.Views.TextArtSettings.textFromFile": "Tiedostosta", - "SSE.Views.TextArtSettings.textFromUrl": "Verkko-osoitteesta", + "SSE.Views.TextArtSettings.textFromUrl": "URL-osoitteesta", "SSE.Views.TextArtSettings.textGradient": "Kalteva", "SSE.Views.TextArtSettings.textGradientFill": "Kalteva täyttö", "SSE.Views.TextArtSettings.textImageTexture": "Kuva tai pintarakenne", From 13025de93b16fa2a98124aae9c9a6d98c1d04416 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Mar 2020 12:09:34 +0300 Subject: [PATCH 02/13] [SSE] Fix translation --- apps/spreadsheeteditor/main/app/view/ScaleDialog.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js index add9bd0cef..f9cdd2171c 100644 --- a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -68,11 +68,11 @@ define([ '
', '
', '
', - '', + '', '
', '
', '
', - '', + '', '
', '
', '
', From 29c1dfeedc2b8d8dc906f9871772e27fc12e1ef6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Mar 2020 13:17:29 +0300 Subject: [PATCH 03/13] Fix translation --- apps/spreadsheeteditor/main/locale/hu.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/locale/hu.json b/apps/spreadsheeteditor/main/locale/hu.json index 4ba3bf7ed8..862f66db4b 100644 --- a/apps/spreadsheeteditor/main/locale/hu.json +++ b/apps/spreadsheeteditor/main/locale/hu.json @@ -59,7 +59,7 @@ "Common.Views.About.txtVersion": "Verzió", "Common.Views.Chat.textSend": "Küldés", "Common.Views.Comments.textAdd": "Hozzáad", - "Common.Views.Comments.textAddComment": "Hozzászólás hozzáadása", + "Common.Views.Comments.textAddComment": "Hozzáad", "Common.Views.Comments.textAddCommentToDoc": "Hozzászólás hozzáadása a dokumentumhoz", "Common.Views.Comments.textAddReply": "Válasz hozzáadása", "Common.Views.Comments.textAnonym": "Vendég", @@ -1305,7 +1305,7 @@ "SSE.Views.ChartSettingsDlg.textMinorType": "Kisebb típusú", "SSE.Views.ChartSettingsDlg.textMinValue": "Minimum érték", "SSE.Views.ChartSettingsDlg.textNextToAxis": "Tengely mellett", - "SSE.Views.ChartSettingsDlg.textNone": "nincs", + "SSE.Views.ChartSettingsDlg.textNone": "Nincs", "SSE.Views.ChartSettingsDlg.textNoOverlay": "Nincs átfedés", "SSE.Views.ChartSettingsDlg.textOneCell": "Mozgatás cellákkal méretezés nélkül", "SSE.Views.ChartSettingsDlg.textOnTickMarks": "Tengely osztásokon", @@ -2209,7 +2209,7 @@ "SSE.Views.TableSettings.textLast": "Utolsó", "SSE.Views.TableSettings.textLongOperation": "Hosszú művelet", "SSE.Views.TableSettings.textReservedName": "A használni kívánt név már hivatkozásra került egyes képletekben. Kérjük, használjon más nevet.", - "SSE.Views.TableSettings.textResize": "Táblázat átméretezése", + "SSE.Views.TableSettings.textResize": "Táblázat méret", "SSE.Views.TableSettings.textRows": "Sorok", "SSE.Views.TableSettings.textSelectData": "Adatok kiválasztása", "SSE.Views.TableSettings.textTableName": "Táblázat név", From 4b0b7b0472560bf573cc69143ae275a0cea2df48 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Mar 2020 14:21:12 +0300 Subject: [PATCH 04/13] Fix Bug 44940 --- apps/common/main/lib/view/PasswordDialog.js | 9 ++++----- apps/documenteditor/main/app/view/StyleTitleDialog.js | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/PasswordDialog.js b/apps/common/main/lib/view/PasswordDialog.js index 09ed9007cb..8ef59c4858 100644 --- a/apps/common/main/lib/view/PasswordDialog.js +++ b/apps/common/main/lib/view/PasswordDialog.js @@ -55,7 +55,7 @@ define([ _.extend(_options, { width : 350, - height : 220, + height : 238, header : true, cls : 'modal-dlg', contentTemplate : '', @@ -65,7 +65,7 @@ define([ }, options); this.template = options.template || [ - '
', + '
', '
', '', '
', @@ -76,9 +76,8 @@ define([ '
', '', '
', - '
', - '
', - '
' + '
', + '
' ].join(''); this.handler = options.handler; diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js index bbda408ea1..2fdbb01891 100644 --- a/apps/documenteditor/main/app/view/StyleTitleDialog.js +++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js @@ -45,6 +45,7 @@ define([ DE.Views.StyleTitleDialog = Common.UI.Window.extend(_.extend({ options: { width: 350, + height: 196, style: 'min-width: 230px;', cls: 'modal-dlg', buttons: ['ok', 'cancel'] From a7d78a781d74be960cb69b073099878f582d30bd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 27 Mar 2020 20:00:50 +0300 Subject: [PATCH 05/13] [SSE] Fix Bug 44942 --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a523962a06..295da6c0ed 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2245,7 +2245,8 @@ define([ inputtip.ref.getBSTip().$tip.css({ top : showPoint[1] + 'px', - left: showPoint[0] + 'px' + left: showPoint[0] + 'px', + 'z-index': 900 }); } else { if (!inputtip.isHidden && inputtip.ref) { From ed372021333902cae3921dc8f35ff980a7cdd098 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Apr 2020 12:26:19 +0300 Subject: [PATCH 06/13] [Embedded] Add AccessDeny error --- apps/documenteditor/embed/js/ApplicationController.js | 4 ++++ apps/presentationeditor/embed/js/ApplicationController.js | 4 ++++ apps/spreadsheeteditor/embed/js/ApplicationController.js | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 2978100b08..dffc441871 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -414,6 +414,10 @@ DE.ApplicationController = new(function(){ message = me.errorUpdateVersionOnDisconnect; break; + case Asc.c_oAscError.ID.AccessDeny: + message = me.errorAccessDeny; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 6baf1fc989..ffaf30b114 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -514,6 +514,10 @@ PE.ApplicationController = new(function(){ message = me.errorUpdateVersionOnDisconnect; break; + case Asc.c_oAscError.ID.AccessDeny: + message = me.errorAccessDeny; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 7d689f9670..722ed7a11a 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -422,6 +422,10 @@ SSE.ApplicationController = new(function(){ message = me.errorUpdateVersionOnDisconnect; break; + case Asc.c_oAscError.ID.AccessDeny: + message = me.errorAccessDeny; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; From ba1c1e1c1b9e0bffb56e11d2216fe1898fb31fab Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 10 Apr 2020 13:14:55 +0300 Subject: [PATCH 07/13] [SSE] Fix Bug 45112 --- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 4 ++-- apps/spreadsheeteditor/main/app/controller/Main.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 295da6c0ed..40168960ce 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2209,8 +2209,8 @@ define([ this.documentHolder.cmpEl.append(inputtip.parentEl); } - var hint = title ? ('' + (title || '') + '
') : ''; - hint += (message || ''); + var hint = title ? ('' + (Common.Utils.String.htmlEncode(title || '')) + '
') : ''; + hint += (Common.Utils.String.htmlEncode(message || '')); if (inputtip.ref && inputtip.ref.isVisible()) { if (inputtip.text != hint) { diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 6952611969..93959d844f 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1436,9 +1436,9 @@ define([ if (icon!==undefined) { config.iconCls = (icon==Asc.c_oAscEDataValidationErrorStyle.Stop) ? 'error' : ((icon==Asc.c_oAscEDataValidationErrorStyle.Information) ? 'info' : 'warn'); } - errData && errData.asc_getErrorTitle() && (config.title = errData.asc_getErrorTitle()); + errData && errData.asc_getErrorTitle() && (config.title = Common.Utils.String.htmlEncode(errData.asc_getErrorTitle())); config.buttons = ['ok', 'cancel']; - config.msg = errData && errData.asc_getError() ? errData.asc_getError() : this.errorDataValidate; + config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate; config.maxwidth = 600; break; From 8b5cd96bce68afa803192e13ac58372699d22d4a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 10 Apr 2020 13:53:25 +0300 Subject: [PATCH 08/13] [SSE] Fix Bug 45105 --- apps/spreadsheeteditor/main/app/controller/Print.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 532047783d..69bada5139 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -244,6 +244,7 @@ define([ } if (this.api) { + Common.UI.Menu.Manager.hideAll(); this.asUrl = asUrl; this.downloadFormat = format; this.printSettingsDlg = (new SSE.Views.PrintSettings({ From b9c32cdfcb1f22cbc92c4600c10b7fab19a49e2b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 23 Apr 2020 19:02:54 +0300 Subject: [PATCH 09/13] [SSE] Fix Bug 45276 --- .../main/app/controller/DocumentHolder.js | 2 +- .../resources/less/advanced-settings.less | 31 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 40168960ce..a16b57a5ab 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -2044,7 +2044,7 @@ define([ name = menuItem.asc_getName(true), origname = me.api.asc_getFormulaNameByLocale(name), mnu = new Common.UI.MenuItem({ - iconCls: (type==Asc.c_oAscPopUpSelectorType.Func) ? 'mnu-popup-func': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'mnu-popup-table' : 'mnu-popup-range') , + iconCls: 'menu__icon ' + ((type==Asc.c_oAscPopUpSelectorType.Func) ? 'btn-function': ((type==Asc.c_oAscPopUpSelectorType.Table) ? 'btn-menu-table' : 'btn-named-range')) , caption: name, hint : (funcdesc && funcdesc[origname]) ? funcdesc[origname].d : '' }).on('click', function(item, e) { diff --git a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less index 4b53ba3b47..d7a69c0825 100644 --- a/apps/spreadsheeteditor/main/resources/less/advanced-settings.less +++ b/apps/spreadsheeteditor/main/resources/less/advanced-settings.less @@ -90,35 +90,4 @@ } } -#menu-formula-selection { - .dropdown-menu li { - .menu-item-icon { - .background-ximage('@{app-image-path}/toolbar-menu.png', '@{app-image-path}/toolbar-menu@2x.png', 20px) !important; - - &.mnu-popup-range { - background-position: 0 -1560px; - } - &.mnu-popup-table { - background-position: 0 -1580px; - } - &.mnu-popup-func { - background-position: 0 -1300px; - } - } - - &.selected { - .mnu-popup-range { - background-position: -20px -1560px; - } - .mnu-popup-table { - background-position: -20px -1580px; - } - .mnu-popup-func { - background-position: -20px -1300px; - } - } - } -} - - From 90128ec48cd4c5019875ce0357b16e0eaec593b0 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 21 Apr 2020 11:20:15 +0300 Subject: [PATCH 10/13] [desktop] fix bug 45170 --- apps/common/main/lib/controller/Desktop.js | 43 ++++++++++++---------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/apps/common/main/lib/controller/Desktop.js b/apps/common/main/lib/controller/Desktop.js index d5dafa7ea8..1e5670f1f1 100644 --- a/apps/common/main/lib/controller/Desktop.js +++ b/apps/common/main/lib/controller/Desktop.js @@ -209,32 +209,37 @@ define([ Common.NotificationCenter.trigger('app:config', {canUndock: true}); } - var header = webapp.getController('Viewport').getView('Common.Views.Header'); titlebuttons = {}; - if ( !!header.btnSave ) { - titlebuttons['save'] = {btn: header.btnSave}; + if ( !mode.isEdit ) { + native.execCommand('webapps:features', JSON.stringify( + {version: config.version, eventloading:true, titlebuttons:true, viewmode:true} )); + } else { + var header = webapp.getController('Viewport').getView('Common.Views.Header'); + if (!!header.btnSave) { + titlebuttons['save'] = {btn: header.btnSave}; - var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class')); - !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]); - } + var iconname = /\s?([^\s]+)$/.exec(titlebuttons.save.btn.$icon.attr('class')); + !!iconname && iconname.length && (titlebuttons.save.icon = btnsave_icons[iconname]); + } - if ( !!header.btnPrint ) - titlebuttons['print'] = {btn: header.btnPrint}; + if (!!header.btnPrint) + titlebuttons['print'] = {btn: header.btnPrint}; - if ( !!header.btnUndo ) - titlebuttons['undo'] = {btn: header.btnUndo}; + if (!!header.btnUndo) + titlebuttons['undo'] = {btn: header.btnUndo}; - if ( !!header.btnRedo ) - titlebuttons['redo'] = {btn: header.btnRedo}; + if (!!header.btnRedo) + titlebuttons['redo'] = {btn: header.btnRedo}; - for (var i in titlebuttons) { - titlebuttons[i].btn.options.signals = ['disabled']; - titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i)); - } + for (var i in titlebuttons) { + titlebuttons[i].btn.options.signals = ['disabled']; + titlebuttons[i].btn.on('disabled', _onTitleButtonDisabled.bind(this, i)); + } - if (!!titlebuttons.save) { - titlebuttons.save.btn.options.signals.push('icon:changed'); - titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this)); + if (!!titlebuttons.save) { + titlebuttons.save.btn.options.signals.push('icon:changed'); + titlebuttons.save.btn.on('icon:changed', _onSaveIconChanged.bind(this)); + } } if ( !!config.callback_editorconfig ) { From 56420dc147c324921a178c103420898e897aa364 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 6 May 2020 19:36:01 +0300 Subject: [PATCH 11/13] [all] copy loader for 'embed' mode --- build/documenteditor.json | 3 ++- build/presentationeditor.json | 3 ++- build/spreadsheeteditor.json | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/documenteditor.json b/build/documenteditor.json index efcb75f30a..4793a5c2ba 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -415,7 +415,8 @@ } ], "index-page": { - "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy" + "../deploy/web-apps/apps/documenteditor/embed/index.html": "../apps/documenteditor/embed/index.html.deploy", + "../deploy/web-apps/apps/documenteditor/embed/index_loader.html": "../apps/documenteditor/embed/index_loader.html.deploy" }, "images-app": [ { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index c5a41e95ff..f5263ba0e4 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -418,7 +418,8 @@ } ], "index-page": { - "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy" + "../deploy/web-apps/apps/presentationeditor/embed/index.html": "../apps/presentationeditor/embed/index.html.deploy", + "../deploy/web-apps/apps/presentationeditor/embed/index_loader.html": "../apps/presentationeditor/embed/index_loader.html.deploy" }, "images-app": [ { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 1f7fc176dc..62a6924b00 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -432,8 +432,9 @@ } ], "index-page": { - "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy" - }, + "../deploy/web-apps/apps/spreadsheeteditor/embed/index.html": "../apps/spreadsheeteditor/embed/index.html.deploy", + "../deploy/web-apps/apps/spreadsheeteditor/embed/index_loader.html": "../apps/spreadsheeteditor/embed/index_loader.html.deploy" + }, "images-app": [ { "expand": true, From 99cee6f85edbfc7c471fa5e60e1192a4b5ab25eb Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 8 May 2020 11:58:31 +0300 Subject: [PATCH 12/13] Send encryptionKeys --- apps/documenteditor/main/app/controller/Main.js | 1 + apps/documenteditor/mobile/app/controller/Main.js | 1 + apps/presentationeditor/main/app/controller/Main.js | 1 + apps/presentationeditor/mobile/app/controller/Main.js | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 1 + apps/spreadsheeteditor/mobile/app/controller/Main.js | 1 + 6 files changed, 6 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2c9598d1b3..2274a064b8 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -412,6 +412,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); // docInfo.put_Review(this.permissions.review); var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType); diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 4d270296c2..b7f28db844 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -253,6 +253,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); var type = /^(?:(pdf|djvu|xps))$/.exec(data.doc.fileType); if (type && typeof type[1] === 'string') { diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index cf0fc63d7e..33a78ba603 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -373,6 +373,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); } this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index e6844cd213..1c3c44b226 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -256,6 +256,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); } this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 93959d844f..554e5beec0 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -413,6 +413,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); this.headerView && this.headerView.setDocumentCaption(data.doc.title); } diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index dd7a3cb23e..88c8a80178 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -269,6 +269,7 @@ define([ docInfo.put_CallbackUrl(this.editorConfig.callbackUrl); docInfo.put_Token(data.doc.token); docInfo.put_Permissions(_permissions); + docInfo.put_EncryptedInfo(this.editorConfig.encryptionKeys); } this.api.asc_registerCallback('asc_onGetEditorPermissions', _.bind(this.onEditorPermissions, this)); From 47ed79537779be86b1060e2626f766868651787c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 18 May 2020 16:19:36 +0300 Subject: [PATCH 13/13] [SSE] Bugfix (#399) --- apps/spreadsheeteditor/main/app/view/CellSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index c8fe0b3a95..0eed6e6146 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -908,7 +908,7 @@ define([ var HexColor0 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[0]).get_color().get_hex(), HexColor1 = Common.Utils.ThemeColor.getRgbColor(this.GradColor.colors[1]).get_color().get_hex(); if (HexColor0 === 'ffffff' && HexColor1 === 'ffffff') { - this.GradColors.colors[0] = {color: '4f81bd', effectId: 24}; // color accent1 + this.GradColor.colors[0] = {color: '4f81bd', effectId: 24}; // color accent1 } } var arrGradStop = [];