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

[PE] Fixed Bug 33406.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-15 11:55:49 +03:00
parent 970d1368aa
commit 26819a5488
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1335,11 +1335,8 @@ define([
}, },
onFocusObject: function(SelectedObjects) { onFocusObject: function(SelectedObjects) {
if (SelectedObjects.length>0) {
var rightpan = this.getApplication().getController('RightMenu'); var rightpan = this.getApplication().getController('RightMenu');
// var docPreview = this.getApplication().getController('Viewport').getView('DocumentPreview'); if (rightpan) rightpan.onFocusObject.call(rightpan, SelectedObjects);
if (rightpan /*&& !docPreview.isVisible()*/) rightpan.onFocusObject.call(rightpan, SelectedObjects);
}
}, },
_onChangeObjectLock: function() { _onChangeObjectLock: function() {

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

@ -114,7 +114,7 @@ define([
this._settings[i].locked = undefined; this._settings[i].locked = undefined;
} }
} }
this._settings[Common.Utils.documentSettingsType.Slide].hidden = 0; this._settings[Common.Utils.documentSettingsType.Slide].hidden = (SelectedObjects.length>0) ? 0 : 1;
for (i=0; i<SelectedObjects.length; i++) for (i=0; i<SelectedObjects.length; i++)
{ {