From abfe324c4b8bbbb78a85d524ecdf3668bdf609eb Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Wed, 3 Aug 2016 14:24:34 +0300 Subject: [PATCH 1/2] Version up --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 1df1eb129..857ceb759 100644 --- a/Readme.md +++ b/Readme.md @@ -1,4 +1,4 @@ -[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.0.2-blue.svg?style=flat) +[![License](https://img.shields.io/badge/License-GNU%20AGPL%20V3-green.svg?style=flat)](http://www.gnu.org/licenses/agpl-3.0.ru.html) ![Release](https://img.shields.io/badge/Release-v4.0.3-blue.svg?style=flat) ## web-apps From 7a2e17340927f794415221f9ba23d233257ef5d1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 3 Aug 2016 14:51:21 +0300 Subject: [PATCH 2/2] Set full toolbar in light version. --- apps/documenteditor/main/app/view/Toolbar.js | 3 +-- apps/presentationeditor/main/app/view/Toolbar.js | 3 +-- apps/spreadsheeteditor/main/app/view/Toolbar.js | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 414026965..57e6535a7 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1247,7 +1247,7 @@ define([ this.trigger('render:before', this); 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"); var valueTitle = (value !== null && parseInt(value) == 1); @@ -1258,7 +1258,6 @@ define([ value = Common.localStorage.getItem("de-hidden-rulers"); var valueRulers = (value !== null && parseInt(value) == 1); - this.mnuitemCompactToolbar.setVisible(!mode.isLightVersion); this.mnuitemCompactToolbar.setChecked(valueCompact, true); this.mnuitemHideTitleBar.setChecked(valueTitle, true); this.mnuitemHideStatusBar.setChecked(valueStatus, true); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 82f71dc91..29574d0b6 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1158,7 +1158,7 @@ define([ this.trigger('render:before', this); 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'); var valueTitle = (value!==null && parseInt(value) == 1); @@ -1169,7 +1169,6 @@ define([ value = Common.localStorage.getItem("pe-hidden-rulers"); var valueRulers = (value !== null && parseInt(value) == 1); - me.mnuitemCompactToolbar.setVisible(!mode.isLightVersion); me.mnuitemCompactToolbar.setChecked(valueCompact); me.mnuitemHideTitleBar.setChecked(valueTitle); me.mnuitemHideStatusBar.setChecked(valueStatus); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 9e07e7b8a..af1fc6b62 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1579,9 +1579,8 @@ define([ 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-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.mnuitemHideTitleBar.setChecked(!!options.title); me.mnuitemHideFormulaBar.setChecked(!!options.formula);