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

[DE] Add separators for wrapping menu

Browse source
This commit is contained in:
Julia Radzhabova 2022-01-12 16:54:46 +03:00
parent 47b5e9d322
commit b0326651d7
3 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/documenteditor/main/app/controller/PageLayout.js
View file

@ -107,12 +107,12 @@ define([
switch ( type ) { switch ( type ) {
case Asc.c_oAscWrapStyle2.Inline: menu.items[0].setChecked(true); break; case Asc.c_oAscWrapStyle2.Inline: menu.items[0].setChecked(true); break;
case Asc.c_oAscWrapStyle2.Square: menu.items[1].setChecked(true); break; case Asc.c_oAscWrapStyle2.Square: menu.items[2].setChecked(true); break;
case Asc.c_oAscWrapStyle2.Tight: menu.items[2].setChecked(true); break; case Asc.c_oAscWrapStyle2.Tight: menu.items[3].setChecked(true); break;
case Asc.c_oAscWrapStyle2.Through: menu.items[3].setChecked(true); break; case Asc.c_oAscWrapStyle2.Through: menu.items[4].setChecked(true); break;
case Asc.c_oAscWrapStyle2.TopAndBottom: menu.items[4].setChecked(true); break; case Asc.c_oAscWrapStyle2.TopAndBottom: menu.items[5].setChecked(true); break;
case Asc.c_oAscWrapStyle2.Behind: menu.items[6].setChecked(true); break; case Asc.c_oAscWrapStyle2.Behind: menu.items[8].setChecked(true); break;
case Asc.c_oAscWrapStyle2.InFront: menu.items[5].setChecked(true); break; case Asc.c_oAscWrapStyle2.InFront: menu.items[7].setChecked(true); break;
default: default:
for (var i in menu.items) { for (var i in menu.items) {
menu.items[i].setChecked( false ); menu.items[i].setChecked( false );
@ -140,7 +140,7 @@ define([
_.each(me.toolbar.btnImgWrapping.menu.items, function(item) { _.each(me.toolbar.btnImgWrapping.menu.items, function(item) {
item.setDisabled(notflow); item.setDisabled(notflow);
}); });
me.toolbar.btnImgWrapping.menu.items[8].setDisabled(!me.api.CanChangeWrapPolygon()); me.toolbar.btnImgWrapping.menu.items[10].setDisabled(!me.api.CanChangeWrapPolygon());
var control_props = me.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, var control_props = me.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked,

32
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -1637,22 +1637,22 @@ define([
this.menuImageWrap.menu.items[0].setChecked(true); this.menuImageWrap.menu.items[0].setChecked(true);
break; break;
case Asc.c_oAscWrapStyle2.Square: case Asc.c_oAscWrapStyle2.Square:
this.menuImageWrap.menu.items[1].setChecked(true);
break;
case Asc.c_oAscWrapStyle2.Tight:
this.menuImageWrap.menu.items[2].setChecked(true); this.menuImageWrap.menu.items[2].setChecked(true);
break; break;
case Asc.c_oAscWrapStyle2.Through: case Asc.c_oAscWrapStyle2.Tight:
this.menuImageWrap.menu.items[3].setChecked(true); this.menuImageWrap.menu.items[3].setChecked(true);
break; break;
case Asc.c_oAscWrapStyle2.TopAndBottom: case Asc.c_oAscWrapStyle2.Through:
this.menuImageWrap.menu.items[4].setChecked(true); this.menuImageWrap.menu.items[4].setChecked(true);
break; break;
case Asc.c_oAscWrapStyle2.TopAndBottom:
this.menuImageWrap.menu.items[5].setChecked(true);
break;
case Asc.c_oAscWrapStyle2.Behind: case Asc.c_oAscWrapStyle2.Behind:
this.menuImageWrap.menu.items[6].setChecked(true); this.menuImageWrap.menu.items[8].setChecked(true);
break; break;
case Asc.c_oAscWrapStyle2.InFront: case Asc.c_oAscWrapStyle2.InFront:
this.menuImageWrap.menu.items[5].setChecked(true); this.menuImageWrap.menu.items[7].setChecked(true);
break; break;
} }
}, },
@ -2329,6 +2329,7 @@ define([
checkmark : false, checkmark : false,
checkable : true checkable : true
}).on('click', onItemClick), }).on('click', onItemClick),
{ caption: '--' },
new Common.UI.MenuItem({ new Common.UI.MenuItem({
caption : me.txtSquare, caption : me.txtSquare,
iconCls : 'menu__icon wrap-square', iconCls : 'menu__icon wrap-square',
@ -2361,6 +2362,7 @@ define([
checkmark : false, checkmark : false,
checkable : true checkable : true
}).on('click', onItemClick), }).on('click', onItemClick),
{ caption: '--' },
new Common.UI.MenuItem({ new Common.UI.MenuItem({
caption : me.txtInFront, caption : me.txtInFront,
iconCls : 'menu__icon wrap-infront', iconCls : 'menu__icon wrap-infront',
@ -2616,7 +2618,7 @@ define([
var cls = 'menu__icon '; var cls = 'menu__icon ';
if (notflow) { if (notflow) {
for (var i = 0; i < 6; i++) { for (var i = 0; i < 8; i++) {
me.menuImageWrap.menu.items[i].setChecked(false); me.menuImageWrap.menu.items[i].setChecked(false);
} }
cls += 'wrap-inline'; cls += 'wrap-inline';
@ -2627,31 +2629,31 @@ define([
cls += 'wrap-inline'; cls += 'wrap-inline';
break; break;
case Asc.c_oAscWrapStyle2.Square: case Asc.c_oAscWrapStyle2.Square:
me.menuImageWrap.menu.items[1].setChecked(true); me.menuImageWrap.menu.items[2].setChecked(true);
cls += 'wrap-square'; cls += 'wrap-square';
break; break;
case Asc.c_oAscWrapStyle2.Tight: case Asc.c_oAscWrapStyle2.Tight:
me.menuImageWrap.menu.items[2].setChecked(true); me.menuImageWrap.menu.items[3].setChecked(true);
cls += 'wrap-tight'; cls += 'wrap-tight';
break; break;
case Asc.c_oAscWrapStyle2.Through: case Asc.c_oAscWrapStyle2.Through:
me.menuImageWrap.menu.items[3].setChecked(true); me.menuImageWrap.menu.items[4].setChecked(true);
cls += 'wrap-through'; cls += 'wrap-through';
break; break;
case Asc.c_oAscWrapStyle2.TopAndBottom: case Asc.c_oAscWrapStyle2.TopAndBottom:
me.menuImageWrap.menu.items[4].setChecked(true); me.menuImageWrap.menu.items[5].setChecked(true);
cls += 'wrap-topandbottom'; cls += 'wrap-topandbottom';
break; break;
case Asc.c_oAscWrapStyle2.Behind: case Asc.c_oAscWrapStyle2.Behind:
me.menuImageWrap.menu.items[6].setChecked(true); me.menuImageWrap.menu.items[8].setChecked(true);
cls += 'wrap-behind'; cls += 'wrap-behind';
break; break;
case Asc.c_oAscWrapStyle2.InFront: case Asc.c_oAscWrapStyle2.InFront:
me.menuImageWrap.menu.items[5].setChecked(true); me.menuImageWrap.menu.items[7].setChecked(true);
cls += 'wrap-infront'; cls += 'wrap-infront';
break; break;
default: default:
for (var i = 0; i < 6; i++) { for (var i = 0; i < 8; i++) {
me.menuImageWrap.menu.items[i].setChecked(false); me.menuImageWrap.menu.items[i].setChecked(false);
} }
cls += 'wrap-infront'; cls += 'wrap-infront';

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

@ -1720,7 +1720,9 @@ define([
wrapType : Asc.c_oAscWrapStyle2.Inline, wrapType : Asc.c_oAscWrapStyle2.Inline,
checkmark : false, checkmark : false,
checkable : true checkable : true
}, { },
{ caption: '--' },
{
caption : _holder_view.txtSquare, caption : _holder_view.txtSquare,
iconCls : 'menu__icon wrap-square', iconCls : 'menu__icon wrap-square',
toggleGroup : 'imgwrapping', toggleGroup : 'imgwrapping',
@ -1748,7 +1750,9 @@ define([
wrapType : Asc.c_oAscWrapStyle2.TopAndBottom, wrapType : Asc.c_oAscWrapStyle2.TopAndBottom,
checkmark : false, checkmark : false,
checkable : true checkable : true
}, { },
{ caption: '--' },
{
caption : _holder_view.txtInFront, caption : _holder_view.txtInFront,
iconCls : 'menu__icon wrap-infront', iconCls : 'menu__icon wrap-infront',
toggleGroup : 'imgwrapping', toggleGroup : 'imgwrapping',