From d0c76ab22f50ae2467693a345dc1bdadd1e17e56 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 22 Jan 2025 12:19:32 +0300 Subject: [PATCH 1/2] [PE] Lock animation on deleted slide --- apps/presentationeditor/main/app/controller/Toolbar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index a1d5829463..15e0836bd3 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2784,6 +2784,7 @@ define([ var animationController = me.getApplication().getController('Animation'); animationController.setApi(me.api).setConfig({toolbar: me,mode:config}).createToolbarPanel(); + Array.prototype.push.apply(me.toolbar.slideOnlyControls,animationController.getView().getButtons()); me.toolbar.btnSave.on('disabled', _.bind(me.onBtnChangeState, me, 'save:disabled')); From 6b8838644d7558f5a3c9234fd4b95fffd3590c2f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 22 Jan 2025 17:45:48 +0300 Subject: [PATCH 2/2] Fix translation --- apps/common/main/lib/util/LanguageInfo.js | 3 +-- apps/documenteditor/main/app/controller/RightMenu.js | 2 +- apps/presentationeditor/main/app/controller/RightMenu.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/util/LanguageInfo.js b/apps/common/main/lib/util/LanguageInfo.js index 62df963d60..fe90047815 100644 --- a/apps/common/main/lib/util/LanguageInfo.js +++ b/apps/common/main/lib/util/LanguageInfo.js @@ -440,8 +440,7 @@ Common.util.LanguageInfo = new(function() { 0x0431 : ["ts-ZA", "Tsonga (South Africa)", "Tsonga (South Africa)"], 0x0433 : ["ven-ZA", "South Africa", "South Africa"], 0x0092 : ["ku", "Central Kurdish"], - 0x7C92 : ["ku-Arab", "Central Kurdish", "Central Kurdish"], - 0x0492 : ["ku-Arab-IQ", "Central Kurdish (Iraq)", "Central Kurdish (Iraq)"] + 0x7C92 : ["ku-Arab", "کوردیی ناوەندی", "Central Kurdish"] }; return { diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index daf1ae1f88..4116c031e6 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -247,7 +247,7 @@ define([ } } - if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // если находимся в locked header/footer, то считаем, что все элементы в нем тоже недоступны + if ( this._settings[Common.Utils.documentSettingsType.Header].locked ) { // all elements are locked if header/footer is locked for (i=0; i