Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1272 from ONLYOFFICE/feature/Bug_40453

Browse source 
Bug 40453
This commit is contained in:
Julia Radzhabova 2021-10-25 18:28:39 +03:00 committed by GitHub
parent d81ed7c041 6fe9faf71e
commit b4dd31d900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -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({ var menuSlidePaste = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paste', iconCls: 'menu__icon btn-paste',
caption : me.textPaste, caption : me.textPaste,
@ -2010,9 +2032,13 @@ define([
} }
}); });
me.slideMenu = new Common.UI.Menu({ me.slideMenu = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',
initMenu: function(value) { initMenu: function(value) {
var selectedLast = me.api.asc_IsLastSlideSelected(),
selectedFirst = me.api.asc_IsFirstSlideSelected();
menuSlidePaste.setVisible(value.fromThumbs!==true); menuSlidePaste.setVisible(value.fromThumbs!==true);
me.slideMenu.items[1].setVisible(value.fromThumbs===true); // New Slide me.slideMenu.items[1].setVisible(value.fromThumbs===true); // New Slide
me.slideMenu.items[2].setVisible(value.isSlideSelect===true); // Duplicate Slide me.slideMenu.items[2].setVisible(value.isSlideSelect===true); // Duplicate Slide
@ -2025,10 +2051,16 @@ define([
mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); mnuChangeTheme.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true); menuSlideSettings.setVisible(value.isSlideSelect===true || value.fromThumbs!==true);
menuSlideSettings.options.value = null; menuSlideSettings.options.value = null;
me.slideMenu.items[13].setVisible((!selectedLast || !selectedFirst) && value.isSlideSelect===true);
for (var i = 10; i < 15; i++) { 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); me.slideMenu.items[i].setVisible(value.fromThumbs===true);
} }
mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true); mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true);
var selectedElements = me.api.getSelectedElements(), var selectedElements = me.api.getSelectedElements(),
@ -2095,6 +2127,9 @@ define([
mnuSelectAll, mnuSelectAll,
mnuPrintSelection, mnuPrintSelection,
{caption: '--'}, {caption: '--'},
mnuMoveSlideToStart,
mnuMoveSlideToEnd,
{caption: '--'},
mnuPreview mnuPreview
] ]
}).on('hide:after', function(menu, e, isFromInputControl) { }).on('hide:after', function(menu, e, isFromInputControl) {
@ -3985,7 +4020,9 @@ define([
mniCustomTable: 'Insert Custom Table', mniCustomTable: 'Insert Custom Table',
textFromStorage: 'From Storage', textFromStorage: 'From Storage',
txtWarnUrl: 'Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?', txtWarnUrl: 'Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?',
textEditPoints: 'Edit Points' textEditPoints: 'Edit Points',
txtMoveSlidesToEnd: 'Move Slide to End',
txtMoveSlidesToStart: 'Move Slide to Beginning'
}, PE.Views.DocumentHolder || {})); }, PE.Views.DocumentHolder || {}));
}); });

2
apps/presentationeditor/main/locale/en.json
View file

@ -1255,6 +1255,8 @@
"PE.Views.DocumentHolder.txtLimitUnder": "Limit under text", "PE.Views.DocumentHolder.txtLimitUnder": "Limit under text",
"PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height", "PE.Views.DocumentHolder.txtMatchBrackets": "Match brackets to argument height",
"PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment", "PE.Views.DocumentHolder.txtMatrixAlign": "Matrix alignment",
"PE.Views.DocumentHolder.txtMoveSlidesToEnd": "Move Slide to End",
"PE.Views.DocumentHolder.txtMoveSlidesToStart": "Move Slide to Beginning",
"PE.Views.DocumentHolder.txtNewSlide": "New Slide", "PE.Views.DocumentHolder.txtNewSlide": "New Slide",
"PE.Views.DocumentHolder.txtOverbar": "Bar over text", "PE.Views.DocumentHolder.txtOverbar": "Bar over text",
"PE.Views.DocumentHolder.txtPasteDestFormat": "Use destination theme", "PE.Views.DocumentHolder.txtPasteDestFormat": "Use destination theme",