From 3a1158abb53a6955f580686ce9fce705be4457db Mon Sep 17 00:00:00 2001 From: OVSharova Date: Tue, 12 Oct 2021 22:21:36 +0300 Subject: [PATCH 1/4] Fix Bug 40453 --- .../main/app/view/DocumentHolder.js | 32 +++++++++++++++++-- apps/presentationeditor/main/locale/en.json | 2 ++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 2f15d2be8..46dede2a8 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2010,6 +2010,28 @@ define([ } }); + var mnuMoveSlideToStart = new Common.UI.MenuItem({ + caption: me.txtMoveSlidesToStart + }).on('click', function(item){ + if (me.api) { + me.api.asc_moveSelectedSlidesToStart(); + + me.fireEvent('editcomplete', me); + Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to Start'); + } + }); + + var mnuMoveSlideToEnd = new Common.UI.MenuItem({ + caption: me.txtMoveSlidesToEnd + }).on('click', function(item){ + if (me.api) { + me.api.asc_moveSelectedSlidesToEnd(); + + me.fireEvent('editcomplete', me); + Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to End'); + } + }); + me.slideMenu = new Common.UI.Menu({ cls: 'shifted-right', initMenu: function(value) { @@ -2025,8 +2047,10 @@ define([ mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.options.value = null; + mnuMoveSlideToEnd.setVisible(!me.api.asc_IsLastSlideSelected()); + mnuMoveSlideToStart.setVisible(!me.api.asc_IsFirstSlideSelected()); - for (var i = 10; i < 15; i++) { + for (var i = 12; i < 17; i++) { me.slideMenu.items[i].setVisible(value.fromThumbs===true); } mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true); @@ -2086,6 +2110,8 @@ define([ }), mnuDeleteSlide, mnuSlideHide, + mnuMoveSlideToStart, + mnuMoveSlideToEnd, {caption: '--'}, mnuChangeSlide, mnuResetSlide, @@ -3985,7 +4011,9 @@ define([ mniCustomTable: 'Insert Custom Table', textFromStorage: 'From Storage', txtWarnUrl: 'Clicking this link can be harmful to your device and data.
Are you sure you want to continue?', - textEditPoints: 'Edit Points' + textEditPoints: 'Edit Points', + txtMoveSlidesToEnd: 'Move Slide to End', + txtMoveSlidesToStart: 'Move Slide to Start' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index ff9853868..f92299927 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1252,6 +1252,8 @@ "PE.Views.DocumentHolder.txtLimitUnder": "Limit under text", "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment", + "PE.Views.DocumentHolder.txtMoveSlidesToEnd": "Move Slide to End", + "PE.Views.DocumentHolder.txtMoveSlidesToStart": "Move Slide to Start", "PE.Views.DocumentHolder.txtNewSlide": "New Slide", "PE.Views.DocumentHolder.txtOverbar": "Bar over text", "PE.Views.DocumentHolder.txtPasteDestFormat": "Use destination theme", From 0d28ecc54411fc0b358c0cab163687bb9ea07d28 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 13 Oct 2021 00:58:20 +0300 Subject: [PATCH 2/4] Fix bug --- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 46dede2a8..5c85ac8fb 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2041,7 +2041,7 @@ define([ mnuDeleteSlide.setVisible(value.isSlideSelect===true); mnuSlideHide.setVisible(value.isSlideSelect===true); mnuSlideHide.setChecked(value.isSlideHidden===true); - me.slideMenu.items[5].setVisible(value.isSlideSelect===true || value.fromThumbs!==true); + me.slideMenu.items[7].setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuResetSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); From c1d64aff1e43dc18a416be9121ac739be8a97709 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Sun, 24 Oct 2021 02:15:18 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=A1hange=20of=20position?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/app/view/DocumentHolder.js | 62 ++++++++++--------- apps/presentationeditor/main/locale/en.json | 2 +- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 5c85ac8fb..e167bed1e 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1983,6 +1983,28 @@ define([ } }); + var mnuMoveSlideToStart = new Common.UI.MenuItem({ + caption: me.txtMoveSlidesToStart + }).on('click', function(item){ + if (me.api) { + me.api.asc_moveSelectedSlidesToStart(); + + me.fireEvent('editcomplete', me); + Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to Start'); + } + }); + + var mnuMoveSlideToEnd = new Common.UI.MenuItem({ + caption: me.txtMoveSlidesToEnd + }).on('click', function(item){ + if (me.api) { + me.api.asc_moveSelectedSlidesToEnd(); + + me.fireEvent('editcomplete', me); + Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to End'); + } + }); + var menuSlidePaste = new Common.UI.MenuItem({ iconCls: 'menu__icon btn-paste', caption : me.textPaste, @@ -2010,27 +2032,7 @@ define([ } }); - var mnuMoveSlideToStart = new Common.UI.MenuItem({ - caption: me.txtMoveSlidesToStart - }).on('click', function(item){ - if (me.api) { - me.api.asc_moveSelectedSlidesToStart(); - me.fireEvent('editcomplete', me); - Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to Start'); - } - }); - - var mnuMoveSlideToEnd = new Common.UI.MenuItem({ - caption: me.txtMoveSlidesToEnd - }).on('click', function(item){ - if (me.api) { - me.api.asc_moveSelectedSlidesToEnd(); - - me.fireEvent('editcomplete', me); - Common.component.Analytics.trackEvent('DocumentHolder', 'Move Slide to End'); - } - }); me.slideMenu = new Common.UI.Menu({ cls: 'shifted-right', @@ -2041,18 +2043,21 @@ define([ mnuDeleteSlide.setVisible(value.isSlideSelect===true); mnuSlideHide.setVisible(value.isSlideSelect===true); mnuSlideHide.setChecked(value.isSlideHidden===true); - me.slideMenu.items[7].setVisible(value.isSlideSelect===true || value.fromThumbs!==true); + me.slideMenu.items[5].setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuResetSlide.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.options.value = null; - mnuMoveSlideToEnd.setVisible(!me.api.asc_IsLastSlideSelected()); - mnuMoveSlideToStart.setVisible(!me.api.asc_IsFirstSlideSelected()); - - for (var i = 12; i < 17; i++) { + me.slideMenu.items[13].setVisible((!me.api.asc_IsLastSlideSelected() || !me.api.asc_IsFirstSlideSelected()) && value.isSlideSelect===true); + mnuMoveSlideToEnd.setVisible(!me.api.asc_IsLastSlideSelected() && value.isSlideSelect===true); + mnuMoveSlideToStart.setVisible(!me.api.asc_IsFirstSlideSelected() && value.isSlideSelect===true); + me.slideMenu.items[16].setVisible(value.fromThumbs===true); + me.slideMenu.items[17].setVisible(value.fromThumbs===true); + for (var i = 10; i < 13; i++) { me.slideMenu.items[i].setVisible(value.fromThumbs===true); } + mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true); var selectedElements = me.api.getSelectedElements(), @@ -2110,8 +2115,6 @@ define([ }), mnuDeleteSlide, mnuSlideHide, - mnuMoveSlideToStart, - mnuMoveSlideToEnd, {caption: '--'}, mnuChangeSlide, mnuResetSlide, @@ -2121,6 +2124,9 @@ define([ mnuSelectAll, mnuPrintSelection, {caption: '--'}, + mnuMoveSlideToStart, + mnuMoveSlideToEnd, + {caption: '--'}, mnuPreview ] }).on('hide:after', function(menu, e, isFromInputControl) { @@ -4013,7 +4019,7 @@ define([ txtWarnUrl: 'Clicking this link can be harmful to your device and data.
Are you sure you want to continue?', textEditPoints: 'Edit Points', txtMoveSlidesToEnd: 'Move Slide to End', - txtMoveSlidesToStart: 'Move Slide to Start' + txtMoveSlidesToStart: 'Move Slide to Beginning' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index f92299927..2d2b3914d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1253,7 +1253,7 @@ "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment", "PE.Views.DocumentHolder.txtMoveSlidesToEnd": "Move Slide to End", - "PE.Views.DocumentHolder.txtMoveSlidesToStart": "Move Slide to Start", + "PE.Views.DocumentHolder.txtMoveSlidesToStart": "Move Slide to Beginning", "PE.Views.DocumentHolder.txtNewSlide": "New Slide", "PE.Views.DocumentHolder.txtOverbar": "Bar over text", "PE.Views.DocumentHolder.txtPasteDestFormat": "Use destination theme", From 6fe9faf71e1bc1aca46275b6f3c64c4956b7b816 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Mon, 25 Oct 2021 12:17:32 +0300 Subject: [PATCH 4/4] Refactoring --- apps/presentationeditor/main/app/view/DocumentHolder.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e167bed1e..dc26f66ce 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2037,6 +2037,8 @@ define([ me.slideMenu = new Common.UI.Menu({ cls: 'shifted-right', initMenu: function(value) { + var selectedLast = me.api.asc_IsLastSlideSelected(), + selectedFirst = me.api.asc_IsFirstSlideSelected(); menuSlidePaste.setVisible(value.fromThumbs!==true); me.slideMenu.items[1].setVisible(value.fromThumbs===true); // New Slide me.slideMenu.items[2].setVisible(value.isSlideSelect===true); // Duplicate Slide @@ -2049,11 +2051,12 @@ define([ mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.options.value = null; - me.slideMenu.items[13].setVisible((!me.api.asc_IsLastSlideSelected() || !me.api.asc_IsFirstSlideSelected()) && value.isSlideSelect===true); - mnuMoveSlideToEnd.setVisible(!me.api.asc_IsLastSlideSelected() && value.isSlideSelect===true); - mnuMoveSlideToStart.setVisible(!me.api.asc_IsFirstSlideSelected() && value.isSlideSelect===true); + me.slideMenu.items[13].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true); + mnuMoveSlideToEnd.setVisible(!selectedLast && value.isSlideSelect===true); + mnuMoveSlideToStart.setVisible(!selectedFirst && value.isSlideSelect===true); me.slideMenu.items[16].setVisible(value.fromThumbs===true); me.slideMenu.items[17].setVisible(value.fromThumbs===true); + for (var i = 10; i < 13; i++) { me.slideMenu.items[i].setVisible(value.fromThumbs===true); }