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

[PE] [SSE] Optimization of right panel.

Browse source
This commit is contained in:
Julia Radzhabova 2016-10-18 11:58:27 +03:00
parent bfc91dc91f
commit a7e603ca5f
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/presentationeditor/main/app/controller/RightMenu.js
View file

@ -148,14 +148,15 @@ define([
} }
} }
var lastactive = -1, currentactive, priorityactive = -1; var lastactive = -1, currentactive, priorityactive = -1,
activePane = this.rightmenu.GetActivePane();
for (i=0; i<this._settings.length; i++) { for (i=0; i<this._settings.length; i++) {
var pnl = this._settings[i]; var pnl = this._settings[i];
if (pnl===undefined) continue; if (pnl===undefined) continue;
if ( pnl.hidden ) { if ( pnl.hidden ) {
if (!pnl.btn.isDisabled()) pnl.btn.setDisabled(true); if (!pnl.btn.isDisabled()) pnl.btn.setDisabled(true);
if (this.rightmenu.GetActivePane() == pnl.panelId) if (activePane == pnl.panelId)
currentactive = -1; currentactive = -1;
} else { } else {
if (pnl.btn.isDisabled()) pnl.btn.setDisabled(false); if (pnl.btn.isDisabled()) pnl.btn.setDisabled(false);
@ -165,7 +166,7 @@ define([
pnl.needShow = false; pnl.needShow = false;
priorityactive = i; priorityactive = i;
} else if ( i != Common.Utils.documentSettingsType.Slide || this.rightmenu._settings[i].isCurrent) { } else if ( i != Common.Utils.documentSettingsType.Slide || this.rightmenu._settings[i].isCurrent) {
if (this.rightmenu.GetActivePane() == pnl.panelId) if (activePane == pnl.panelId)
currentactive = i; currentactive = i;
} }

2
apps/presentationeditor/main/app/view/RightMenu.js
View file

@ -254,7 +254,7 @@ define([
}, },
GetActivePane: function() { GetActivePane: function() {
return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id; return (this.minimizedMode) ? null : this.$el.find(".settings-panel.active")[0].id;
}, },
SetDisabled: function(id, disabled, all) { SetDisabled: function(id, disabled, all) {

7
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -177,7 +177,8 @@ define([
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
} }
var lastactive = -1, currentactive, priorityactive = -1; var lastactive = -1, currentactive, priorityactive = -1,
activePane = this.rightmenu.GetActivePane();
for (i=0; i<this._settings.length; ++i) { for (i=0; i<this._settings.length; ++i) {
var pnl = this._settings[i]; var pnl = this._settings[i];
if (pnl===undefined) continue; if (pnl===undefined) continue;
@ -185,7 +186,7 @@ define([
if ( pnl.hidden ) { if ( pnl.hidden ) {
if ( !pnl.btn.isDisabled() ) if ( !pnl.btn.isDisabled() )
pnl.btn.setDisabled(true); pnl.btn.setDisabled(true);
if (this.rightmenu.GetActivePane() == pnl.panelId) if (activePane == pnl.panelId)
currentactive = -1; currentactive = -1;
} else { } else {
if ( pnl.btn.isDisabled() ) if ( pnl.btn.isDisabled() )
@ -194,7 +195,7 @@ define([
if ( pnl.needShow ) { if ( pnl.needShow ) {
pnl.needShow = false; pnl.needShow = false;
priorityactive = i; priorityactive = i;
} else if (this.rightmenu.GetActivePane() == pnl.panelId) } else if (activePane == pnl.panelId)
currentactive = i; currentactive = i;
pnl.panel.setLocked(pnl.locked); pnl.panel.setLocked(pnl.locked);
} }

2
apps/spreadsheeteditor/main/app/view/RightMenu.js
View file

@ -234,7 +234,7 @@ define([
}, },
GetActivePane: function() { GetActivePane: function() {
return (this.minimizedMode) ? null : $(".settings-panel.active")[0].id; return (this.minimizedMode) ? null : this.$el.find(".settings-panel.active")[0].id;
}, },
clearSelection: function() { clearSelection: function() {