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

[SSE] Fix Bug 39312

Browse source
This commit is contained in:
Julia Radzhabova 2018-10-24 13:46:58 +03:00 committed by Alexey Golubev
parent 17d1c645f4
commit 44a1e85c94
3 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1483,8 +1483,10 @@ define([
var pluginGuid = (documentHolder.mnuImgAdvanced.imageInfo) ? documentHolder.mnuImgAdvanced.imageInfo.asc_getPluginGuid() : null; var pluginGuid = (documentHolder.mnuImgAdvanced.imageInfo) ? documentHolder.mnuImgAdvanced.imageInfo.asc_getPluginGuid() : null;
documentHolder.menuImgReplace.setVisible(isimageonly && (pluginGuid===null || pluginGuid===undefined)); documentHolder.menuImgReplace.setVisible(isimageonly && (pluginGuid===null || pluginGuid===undefined));
documentHolder.menuImgReplace.setDisabled(isObjLocked || pluginGuid===null); documentHolder.menuImgReplace.setDisabled(isObjLocked || pluginGuid===null);
documentHolder.mnuBringToFront.setDisabled(isObjLocked);
documentHolder.mnuSendToBack.setDisabled(isObjLocked);
documentHolder.mnuBringForward.setDisabled(isObjLocked);
documentHolder.mnuSendBackward.setDisabled(isObjLocked);
var isInSign = !!signGuid; var isInSign = !!signGuid;
documentHolder.menuSignatureEditSign.setVisible(isInSign); documentHolder.menuSignatureEditSign.setVisible(isInSign);

49
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -605,6 +605,30 @@ define([
}) })
}); });
me.mnuBringToFront = new Common.UI.MenuItem({
caption : this.textArrangeFront,
iconCls : 'mnu-arrange-front',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.BringToFront
});
me.mnuSendToBack = new Common.UI.MenuItem({
caption : this.textArrangeBack,
iconCls : 'mnu-arrange-back',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendToBack
});
me.mnuBringForward = new Common.UI.MenuItem({
caption : this.textArrangeForward,
iconCls : 'mnu-arrange-forward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.BringForward
});
me.mnuSendBackward = new Common.UI.MenuItem({
caption: this.textArrangeBackward,
iconCls : 'mnu-arrange-backward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendBackward
});
this.imgMenu = new Common.UI.Menu({ this.imgMenu = new Common.UI.Menu({
items: [ items: [
me.pmiImgCut, me.pmiImgCut,
@ -614,27 +638,10 @@ define([
me.menuSignatureEditSign, me.menuSignatureEditSign,
me.menuSignatureEditSetup, me.menuSignatureEditSetup,
me.menuEditSignSeparator, me.menuEditSignSeparator,
{ me.mnuBringToFront,
caption : this.textArrangeFront, me.mnuSendToBack,
iconCls : 'mnu-arrange-front', me.mnuBringForward,
type : 'arrange', me.mnuSendBackward,
value : Asc.c_oAscDrawingLayerType.BringToFront
},{
caption : this.textArrangeBack,
iconCls : 'mnu-arrange-back',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendToBack
},{
caption : this.textArrangeForward,
iconCls : 'mnu-arrange-forward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.BringForward
},{
caption: this.textArrangeBackward,
iconCls : 'mnu-arrange-backward',
type : 'arrange',
value : Asc.c_oAscDrawingLayerType.SendBackward
},
{caption: '--'}, {caption: '--'},
me.mnuGroupImg, me.mnuGroupImg,
me.mnuUnGroupImg, me.mnuUnGroupImg,

8
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1410,7 +1410,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-align', iconCls: 'btn-img-align',
caption: me.capImgAlign, caption: me.capImgAlign,
lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth], lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu: true menu: true
}); });
@ -1418,7 +1418,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-group', iconCls: 'btn-img-group',
caption: me.capImgGroup, caption: me.capImgGroup,
lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth], lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu: true menu: true
}); });
me.btnImgForward = new Common.UI.Button({ me.btnImgForward = new Common.UI.Button({
@ -1426,14 +1426,14 @@ define([
iconCls: 'btn-img-frwd', iconCls: 'btn-img-frwd',
caption: me.capImgForward, caption: me.capImgForward,
split: true, split: true,
lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth], lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu: true menu: true
}); });
me.btnImgBackward = new Common.UI.Button({ me.btnImgBackward = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-img-bkwd', iconCls: 'btn-img-bkwd',
caption: me.capImgBackward, caption: me.capImgBackward,
lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth], lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText],
split: true, split: true,
menu: true menu: true
}); });