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
cb90b364
Commit
cb90b364
authored
Mar 13, 2017
by
Alexey Golubev
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hotfix/v4.2.11'
parents
8b8b9b66
ea4339f6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
8 deletions
+20
-8
apps/api/documents/api.js
apps/api/documents/api.js
+2
-2
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+6
-2
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+6
-2
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+6
-2
No files found.
apps/api/documents/api.js
View file @
cb90b364
...
...
@@ -96,7 +96,7 @@
info: 'Some info',
logo: ''
},
about:
fals
e,
about:
tru
e,
feedback: {
visible: false,
url: http://...
...
...
@@ -551,7 +551,7 @@
lang
:
'
en
'
,
canCoAuthoring
:
true
,
customization
:
{
about
:
fals
e
,
about
:
tru
e
,
feedback
:
false
}
}
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
cb90b364
...
...
@@ -1474,8 +1474,12 @@ define([
hidePreloader
:
function
()
{
if
(
!
this
.
_state
.
customizationDone
)
{
this
.
_state
.
customizationDone
=
true
;
if
(
this
.
appOptions
.
customization
&&
!
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
true
;
if
(
this
.
appOptions
.
customization
)
{
if
(
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
false
;
else
if
(
!
this
.
appOptions
.
canBrandingExt
)
this
.
appOptions
.
customization
.
about
=
true
;
}
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationElements
);
if
(
this
.
appOptions
.
canBrandingExt
)
{
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationExtElements
);
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
cb90b364
...
...
@@ -1227,8 +1227,12 @@ define([
hidePreloader
:
function
()
{
if
(
!
this
.
_state
.
customizationDone
)
{
this
.
_state
.
customizationDone
=
true
;
if
(
this
.
appOptions
.
customization
&&
!
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
true
;
if
(
this
.
appOptions
.
customization
)
{
if
(
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
false
;
else
if
(
!
this
.
appOptions
.
canBrandingExt
)
this
.
appOptions
.
customization
.
about
=
true
;
}
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationElements
);
if
(
this
.
appOptions
.
canBrandingExt
)
{
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationExtElements
);
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
cb90b364
...
...
@@ -1365,8 +1365,12 @@ define([
hidePreloader
:
function
()
{
if
(
!
this
.
_state
.
customizationDone
)
{
this
.
_state
.
customizationDone
=
true
;
if
(
this
.
appOptions
.
customization
&&
!
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
true
;
if
(
this
.
appOptions
.
customization
)
{
if
(
this
.
appOptions
.
isDesktopApp
)
this
.
appOptions
.
customization
.
about
=
false
;
else
if
(
!
this
.
appOptions
.
canBrandingExt
)
this
.
appOptions
.
customization
.
about
=
true
;
}
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationElements
);
if
(
this
.
appOptions
.
canBrandingExt
)
{
Common
.
Utils
.
applyCustomization
(
this
.
appOptions
.
customization
,
mapCustomizationExtElements
);
...
...
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