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

Merge tag 'v4.0.3' into develop

Browse source 
v4.0.3

Conflicts:
	Readme.md
This commit is contained in:
Alexey Golubev 2016-08-04 16:31:09 +03:00
parent 4d9125372f 7a5e775d59
commit 4dec00ebac
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1253,7 +1253,7 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var value = Common.localStorage.getItem("de-compact-toolbar"); var value = Common.localStorage.getItem("de-compact-toolbar");
var valueCompact = (mode.isLightVersion || value !== null && parseInt(value) == 1); var valueCompact = (value !== null && parseInt(value) == 1);
value = Common.localStorage.getItem("de-hidden-title"); value = Common.localStorage.getItem("de-hidden-title");
var valueTitle = (value !== null && parseInt(value) == 1); var valueTitle = (value !== null && parseInt(value) == 1);
@ -1264,7 +1264,6 @@ define([
value = Common.localStorage.getItem("de-hidden-rulers"); value = Common.localStorage.getItem("de-hidden-rulers");
var valueRulers = (value !== null && parseInt(value) == 1); var valueRulers = (value !== null && parseInt(value) == 1);
this.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
this.mnuitemCompactToolbar.setChecked(valueCompact, true); this.mnuitemCompactToolbar.setChecked(valueCompact, true);
this.mnuitemHideTitleBar.setChecked(valueTitle, true); this.mnuitemHideTitleBar.setChecked(valueTitle, true);
this.mnuitemHideStatusBar.setChecked(valueStatus, true); this.mnuitemHideStatusBar.setChecked(valueStatus, true);

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

@ -1158,7 +1158,7 @@ define([
this.trigger('render:before', this); this.trigger('render:before', this);
var value = Common.localStorage.getItem('pe-compact-toolbar'); var value = Common.localStorage.getItem('pe-compact-toolbar');
var valueCompact = (mode.isLightVersion || value!==null && parseInt(value) == 1); var valueCompact = (value!==null && parseInt(value) == 1);
value = Common.localStorage.getItem('pe-hidden-title'); value = Common.localStorage.getItem('pe-hidden-title');
var valueTitle = (value!==null && parseInt(value) == 1); var valueTitle = (value!==null && parseInt(value) == 1);
@ -1169,7 +1169,6 @@ define([
value = Common.localStorage.getItem("pe-hidden-rulers"); value = Common.localStorage.getItem("pe-hidden-rulers");
var valueRulers = (value !== null && parseInt(value) == 1); var valueRulers = (value !== null && parseInt(value) == 1);
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(valueCompact); me.mnuitemCompactToolbar.setChecked(valueCompact);
me.mnuitemHideTitleBar.setChecked(valueTitle); me.mnuitemHideTitleBar.setChecked(valueTitle);
me.mnuitemHideStatusBar.setChecked(valueStatus); me.mnuitemHideStatusBar.setChecked(valueStatus);

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

@ -1579,9 +1579,8 @@ define([
JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true); JSON.parse(Common.localStorage.getItem('sse-hidden-title')) && (options.title = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true); JSON.parse(Common.localStorage.getItem('sse-hidden-formula')) && (options.formula = true);
JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true); JSON.parse(Common.localStorage.getItem('sse-hidden-headings')) && (options.headings = true);
var isCompactView = mode.isLightVersion || !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact')); var isCompactView = !!JSON.parse(Common.localStorage.getItem('sse-toolbar-compact'));
me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion);
me.mnuitemCompactToolbar.setChecked(isCompactView); me.mnuitemCompactToolbar.setChecked(isCompactView);
me.mnuitemHideTitleBar.setChecked(!!options.title); me.mnuitemHideTitleBar.setChecked(!!options.title);
me.mnuitemHideFormulaBar.setChecked(!!options.formula); me.mnuitemHideFormulaBar.setChecked(!!options.formula);