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

Fix Bug 39096

Browse source
This commit is contained in:
Julia Radzhabova 2018-10-26 12:49:11 +03:00
parent c62858944f
commit a95c95204f
8 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -5,6 +5,7 @@
* Add rotation and flip to image and shape settings (bug #19378) * Add rotation and flip to image and shape settings (bug #19378)
* Save file copy to selected folder (bug #23603, bug #32790) * Save file copy to selected folder (bug #23603, bug #32790)
* Load image from storage * Load image from storage
* Add customization parameter 'hideRightMenu' for hiding right panel on first loading (bug #39096)
### Document Editor ### Document Editor

1
apps/api/documents/api.js
View file

@ -116,6 +116,7 @@
compactToolbar: false, compactToolbar: false,
leftMenu: true, leftMenu: true,
rightMenu: true, rightMenu: true,
hideRightMenu: false, // hide or show right panel on first loading
toolbar: true, toolbar: true,
header: true, header: true,
statusBar: true, statusBar: true,

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

@ -279,7 +279,7 @@ define([
this.rightmenu.shapeSettings.createDelayedElements(); this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) { if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings")); this.onFocusObject(selectedElements, !Common.localStorage.getBool("de-hide-right-settings", this.rightmenu.defaultHideRightMenu));
} }
} }
}, },

3
apps/documenteditor/main/app/view/RightMenu.js
View file

@ -150,7 +150,8 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var open = !Common.localStorage.getBool("de-hide-right-settings"); this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu;
var open = !Common.localStorage.getBool("de-hide-right-settings", this.defaultHideRightMenu);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show(); el.show();

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

@ -287,7 +287,7 @@ define([
this.rightmenu.shapeSettings.createDelayedElements(); this.rightmenu.shapeSettings.createDelayedElements();
var selectedElements = this.api.getSelectedElements(); var selectedElements = this.api.getSelectedElements();
if (selectedElements.length>0) { if (selectedElements.length>0) {
this.onFocusObject(selectedElements, !Common.localStorage.getBool("pe-hide-right-settings")); this.onFocusObject(selectedElements, !Common.localStorage.getBool("pe-hide-right-settings", this.rightmenu.defaultHideRightMenu));
} }
} }
}, },

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

@ -149,7 +149,8 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var open = !Common.localStorage.getBool("pe-hide-right-settings"); this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu;
var open = !Common.localStorage.getBool("pe-hide-right-settings", this.defaultHideRightMenu);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.show(); el.show();

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

@ -306,8 +306,7 @@ define([
createDelayedElements: function() { createDelayedElements: function() {
var me = this; var me = this;
if (this.api) { if (this.api) {
var open = Common.localStorage.getItem("sse-hide-right-settings"); this._openRightMenu = !Common.localStorage.getBool("sse-hide-right-settings", this.rightmenu.defaultHideRightMenu);
this._openRightMenu = (open===null || parseInt(open) == 0);
this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this)); this.api.asc_registerCallback('asc_onSelectionChanged', _.bind(this.onSelectionChanged, this));
this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this)); this.api.asc_registerCallback('asc_doubleClickOnObject', _.bind(this.onDoubleClickOnObject, this));

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

@ -161,7 +161,8 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var open = !Common.localStorage.getBool("sse-hide-right-settings"); this.defaultHideRightMenu = mode.customization && !!mode.customization.hideRightMenu;
var open = !Common.localStorage.getBool("sse-hide-right-settings", this.defaultHideRightMenu);
el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px'); el.css('width', ((open) ? MENU_SCALE_PART : SCALE_MIN) + 'px');
el.css('z-index', 101); el.css('z-index', 101);
el.show(); el.show();