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

Delete separator

Browse source
This commit is contained in:
OVSharova 2021-12-17 16:53:21 +03:00
parent b829192ed3
commit b334b929ee
2 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -1463,35 +1463,22 @@ define([
else else
last = menuItems[5]; last = menuItems[5];
// theme // theme and zoom
if (!menuItems[6].isVisible()) if (!menuItems[6].isVisible() && !menuItems[7].isVisible())
menuItems[7].setVisible(false); menuItems[8].setVisible(false);
else else
last = menuItems[7]; last = menuItems[8];
//last = menuItems[8];
// share, location // share, location
if (!menuItems[10].isVisible() && !menuItems[11].isVisible()) if (!menuItems[9].isVisible() && !menuItems[10].isVisible())
menuItems[12].setVisible(false); menuItems[11].setVisible(false);
else else
last = menuItems[12]; last = menuItems[11];
// embed, fullscreen // embed, fullscreen
if (!menuItems[13].isVisible() && !menuItems[14].isVisible()) if (!menuItems[12].isVisible() && !menuItems[13].isVisible())
last && last.setVisible(false); last && last.setVisible(false);
// share, location
/*if (!menuItems[8].isVisible() && !menuItems[9].isVisible())
menuItems[10].setVisible(false);
else
last = menuItems[10];
// embed, fullscreen
if (!menuItems[11].isVisible() && !menuItems[12].isVisible())
last && last.setVisible(false);*/
menu.off('show:after', initMenu); menu.off('show:after', initMenu);
}; };
@ -1542,22 +1529,22 @@ define([
} }
if ( !this.embedConfig.shareUrl || this.appOptions.isOFORM) { if ( !this.embedConfig.shareUrl || this.appOptions.isOFORM) {
menuItems[10].setVisible(false); menuItems[9].setVisible(false);
itemsCount--; itemsCount--;
} }
if (!this.appOptions.canBackToFolder) { if (!this.appOptions.canBackToFolder) {
menuItems[11].setVisible(false); menuItems[10].setVisible(false);
itemsCount--; itemsCount--;
} }
if ( !this.embedConfig.embedUrl || this.appOptions.isOFORM) { if ( !this.embedConfig.embedUrl || this.appOptions.isOFORM) {
menuItems[13].setVisible(false); menuItems[12].setVisible(false);
itemsCount--; itemsCount--;
} }
if ( !this.embedConfig.fullscreenUrl || this.appOptions.isOFORM) { if ( !this.embedConfig.fullscreenUrl || this.appOptions.isOFORM) {
menuItems[14].setVisible(false); menuItems[13].setVisible(false);
itemsCount--; itemsCount--;
} }
if (itemsCount<1) if (itemsCount<1)

1
apps/documenteditor/forms/app/view/ApplicationView.js
View file

@ -31,7 +31,6 @@ define([
items: [] items: []
}) })
}, },
{caption: '--'},
{caption: this.textZoom, value: 'zoomn', conCls: 'mi-icon' , {caption: this.textZoom, value: 'zoomn', conCls: 'mi-icon' ,
menu : this.mnuZoom = new Common.UI.Menu({ menu : this.mnuZoom = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',