Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
web-apps
Commits
4dec00eb
Commit
4dec00eb
authored
Aug 04, 2016
by
Alexey Golubev
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v4.0.3' into develop
v4.0.3 Conflicts: Readme.md
parents
4d912537
7a5e775d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
apps/documenteditor/main/app/view/Toolbar.js
apps/documenteditor/main/app/view/Toolbar.js
+1
-2
apps/presentationeditor/main/app/view/Toolbar.js
apps/presentationeditor/main/app/view/Toolbar.js
+1
-2
apps/spreadsheeteditor/main/app/view/Toolbar.js
apps/spreadsheeteditor/main/app/view/Toolbar.js
+1
-2
No files found.
apps/documenteditor/main/app/view/Toolbar.js
View file @
4dec00eb
...
...
@@ -1253,7 +1253,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
);
...
...
@@ -1264,7 +1264,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
);
...
...
apps/presentationeditor/main/app/view/Toolbar.js
View file @
4dec00eb
...
...
@@ -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
);
...
...
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @
4dec00eb
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment