Commit 4dec00eb authored by Alexey Golubev's avatar Alexey Golubev

Merge tag 'v4.0.3' into develop

v4.0.3

Conflicts:
	Readme.md
parents 4d912537 7a5e775d
...@@ -1253,7 +1253,7 @@ define([ ...@@ -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([ ...@@ -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);
......
...@@ -1158,7 +1158,7 @@ define([ ...@@ -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([ ...@@ -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);
......
...@@ -1579,9 +1579,8 @@ define([ ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment