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

[PE] Fix Bug 58462

Browse source
This commit is contained in:
Julia Radzhabova 2022-08-10 22:29:53 +03:00
parent f07a4ec7fb
commit b77d633402
3 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -108,7 +108,8 @@ define([
in_equation: undefined, in_equation: undefined,
in_chart: false, in_chart: false,
no_columns: false, no_columns: false,
clrhighlight: undefined clrhighlight: undefined,
can_copycut: undefined
}; };
this._isAddingShape = false; this._isAddingShape = false;
this.slideSizeArr = [ this.slideSizeArr = [
@ -403,6 +404,7 @@ define([
this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this)); this.api.asc_registerCallback('asc_onTextLanguage', _.bind(this.onTextLanguage, this));
Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this)); Common.NotificationCenter.on('storage:image-load', _.bind(this.openImageFromStorage, this));
Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this)); Common.NotificationCenter.on('storage:image-insert', _.bind(this.insertImageFromStorage, this));
this.api.asc_registerCallback('asc_onCanCopyCut', _.bind(this.onApiCanCopyCut, this));
} else if (this.mode.isRestrictedEdit) { } else if (this.mode.isRestrictedEdit) {
this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this)); this.api.asc_registerCallback('asc_onCountPages', _.bind(this.onApiCountPagesRestricted, this));
} }
@ -2531,6 +2533,7 @@ define([
activateControls: function() { activateControls: function() {
this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight()); this.onApiPageSize(this.api.get_PresentationWidth(), this.api.get_PresentationHeight());
this.toolbar.lockToolbar(Common.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)}); this.toolbar.lockToolbar(Common.enumLock.disableOnStart, false, {array: this.toolbar.slideOnlyControls.concat(this.toolbar.shapeControls)});
this.toolbar.lockToolbar(Common.enumLock.copyLock, this._state.can_copycut!==true, {array: [this.toolbar.btnCopy, this.toolbar.btnCut]});
this._state.activated = true; this._state.activated = true;
}, },
@ -2677,6 +2680,13 @@ define([
this.api && this.api.asc_AddVideo(); this.api && this.api.asc_AddVideo();
}, },
onApiCanCopyCut: function(can) {
if (this._state.can_copycut !== can) {
this.toolbar.lockToolbar(Common.enumLock.copyLock, !can, {array: [this.toolbar.btnCopy, this.toolbar.btnCut]});
this._state.can_copycut = can;
}
},
textEmptyImgUrl : 'You need to specify image URL.', textEmptyImgUrl : 'You need to specify image URL.',
textWarning : 'Warning', textWarning : 'Warning',
textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 300', textFontSizeErr : 'The entered value is incorrect.<br>Please enter a numeric value between 1 and 300',

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

@ -819,6 +819,8 @@ define([
menuViewCopySeparator.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); menuViewCopySeparator.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
me.menuViewAddComment.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); me.menuViewAddComment.setVisible(!value.isChart && me.api.can_AddQuotedComment() !== false && me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
me.menuViewAddComment.setDisabled(value.locked); me.menuViewAddComment.setDisabled(value.locked);
var cancopy = me.api && me.api.can_CopyCut();
me.menuViewCopy.setDisabled(!cancopy);
}, },
items: [ items: [
me.menuViewCopy, me.menuViewCopy,
@ -1894,7 +1896,9 @@ define([
/** coauthoring end **/ /** coauthoring end **/
me.menuParagraphAdvanced.setDisabled(disabled); me.menuParagraphAdvanced.setDisabled(disabled);
me.menuParaCut.setDisabled(disabled); var cancopy = me.api && me.api.can_CopyCut();
me.menuParaCopy.setDisabled(!cancopy);
me.menuParaCut.setDisabled(disabled || !cancopy);
me.menuParaPaste.setDisabled(disabled); me.menuParaPaste.setDisabled(disabled);
// spellCheck // spellCheck
@ -2007,7 +2011,10 @@ define([
me.menuTableCellAlign.setDisabled(value.tableProps.locked || disabled); me.menuTableCellAlign.setDisabled(value.tableProps.locked || disabled);
me.menuTableAdvanced.setDisabled(value.tableProps.locked || disabled); me.menuTableAdvanced.setDisabled(value.tableProps.locked || disabled);
me.menuTableCut.setDisabled(value.tableProps.locked || disabled);
var cancopy = me.api && me.api.can_CopyCut();
me.menuTableCopy.setDisabled(!cancopy);
me.menuTableCut.setDisabled(value.tableProps.locked || disabled || !cancopy);
me.menuTablePaste.setDisabled(value.tableProps.locked || disabled); me.menuTablePaste.setDisabled(value.tableProps.locked || disabled);
// hyperlink properties // hyperlink properties
@ -2173,7 +2180,9 @@ define([
if (me.menuChartEdit.isVisible()) if (me.menuChartEdit.isVisible())
me.menuChartEdit.setDisabled(disabled); me.menuChartEdit.setDisabled(disabled);
me.menuImgCut.setDisabled(disabled); var cancopy = me.api && me.api.can_CopyCut();
me.menuImgCopy.setDisabled(!cancopy);
me.menuImgCut.setDisabled(disabled || !cancopy);
me.menuImgPaste.setDisabled(disabled); me.menuImgPaste.setDisabled(disabled);
menuImgShapeArrange.setDisabled(disabled); menuImgShapeArrange.setDisabled(disabled);
me.menuAddToLayoutImg.setDisabled(disabled); me.menuAddToLayoutImg.setDisabled(disabled);

7
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -99,7 +99,8 @@ define([
noAnimationPreview: 'no-animation-preview', noAnimationPreview: 'no-animation-preview',
noAnimationRepeat: 'no-animation-repeat', noAnimationRepeat: 'no-animation-repeat',
noAnimationDuration: 'no-animation-duration', noAnimationDuration: 'no-animation-duration',
timingLock: 'timing-lock' timingLock: 'timing-lock',
copyLock: 'can-copy'
}; };
for (var key in enumLock) { for (var key in enumLock) {
if (enumLock.hasOwnProperty(key)) { if (enumLock.hasOwnProperty(key)) {
@ -256,7 +257,7 @@ define([
id: 'id-toolbar-btn-copy', id: 'id-toolbar-btn-copy',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-copy', iconCls: 'toolbar__icon btn-copy',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.copyLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'top', dataHintDirection: 'top',
dataHintTitle: 'C' dataHintTitle: 'C'
@ -278,7 +279,7 @@ define([
id: 'id-toolbar-btn-cut', id: 'id-toolbar-btn-cut',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-cut', iconCls: 'toolbar__icon btn-cut',
lock: [_set.slideDeleted, _set.paragraphLock, _set.shapeLock, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.paragraphLock, _set.shapeLock, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.copyLock],
dataHint: '1', dataHint: '1',
dataHintDirection: 'top', dataHintDirection: 'top',
dataHintTitle: 'X' dataHintTitle: 'X'