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

Merge branch 'develop' into refactor

Browse source
This commit is contained in:
Julia Radzhabova 2016-09-01 15:04:33 +03:00
parent 88470500d5 57a9fef453
commit 0256616e17
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -975,7 +975,7 @@ define([
this.btnPageMargins.menu.items[0].setVisible(false); this.btnPageMargins.menu.items[0].setVisible(false);
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);
me.$el.html(this.template({ me.$el.html(this.template({
isCompactView: valueCompact isCompactView: valueCompact
@ -1397,7 +1397,7 @@ define([
/**/ /**/
var mode = this.mode; var mode = this.mode;
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);
@ -1408,7 +1408,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.mnuitemCompactToolbar.on('toggle', _.bind(this.changeViewMode, this)); this.mnuitemCompactToolbar.on('toggle', _.bind(this.changeViewMode, this));