diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 24e97d8c8..a964dcd14 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1335,11 +1335,8 @@ define([ }, onFocusObject: function(SelectedObjects) { - if (SelectedObjects.length>0) { var rightpan = this.getApplication().getController('RightMenu'); -// var docPreview = this.getApplication().getController('Viewport').getView('DocumentPreview'); - if (rightpan /*&& !docPreview.isVisible()*/) rightpan.onFocusObject.call(rightpan, SelectedObjects); - } + if (rightpan) rightpan.onFocusObject.call(rightpan, SelectedObjects); }, _onChangeObjectLock: function() { diff --git a/apps/presentationeditor/main/app/controller/RightMenu.js b/apps/presentationeditor/main/app/controller/RightMenu.js index 5428d872e..400699d74 100644 --- a/apps/presentationeditor/main/app/controller/RightMenu.js +++ b/apps/presentationeditor/main/app/controller/RightMenu.js @@ -114,7 +114,7 @@ define([ 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