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
518c4212
Commit
518c4212
authored
Dec 20, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New licence type SuccessLimit.
parent
24ce4d9b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+4
-4
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+4
-4
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+4
-4
No files found.
apps/documenteditor/main/app/controller/Main.js
View file @
518c4212
...
...
@@ -974,7 +974,7 @@ define([
this
.
permissions
.
edit
=
this
.
permissions
.
review
=
false
;
this
.
appOptions
.
canAnalytics
=
params
.
asc_getIsAnalyticsEnable
();
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
);
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
||
licType
===
Asc
.
c_oLicenseResult
.
SuccessLimit
);
this
.
appOptions
.
isLightVersion
=
params
.
asc_getIsLight
();
/** coauthoring begin **/
this
.
appOptions
.
canCoAuthoring
=
!
this
.
appOptions
.
isLightVersion
;
...
...
@@ -992,8 +992,8 @@ define([
this
.
appOptions
.
canHistoryRestore
=
this
.
editorConfig
.
canHistoryRestore
&&
!!
this
.
permissions
.
changeHistory
;
this
.
appOptions
.
canUseMailMerge
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
&&
!
this
.
appOptions
.
isDesktopApp
;
this
.
appOptions
.
canSendEmailAddresses
=
this
.
appOptions
.
canLicense
&&
this
.
editorConfig
.
canSendEmailAddresses
&&
this
.
appOptions
.
canEdit
&&
this
.
appOptions
.
canCoAuthoring
;
this
.
appOptions
.
canComments
=
this
.
appOptions
.
canLicense
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canComments
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canEditStyles
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
;
this
.
appOptions
.
canPrint
=
(
this
.
permissions
.
print
!==
false
);
this
.
appOptions
.
canRename
=
!!
this
.
permissions
.
rename
;
...
...
@@ -1006,7 +1006,7 @@ define([
this
.
_state
.
licenseWarning
=
(
licType
===
Asc
.
c_oLicenseResult
.
Connections
)
&&
this
.
appOptions
.
canEdit
&&
this
.
editorConfig
.
mode
!==
'
view
'
;
var
headerView
=
this
.
getApplication
().
getController
(
'
Viewport
'
).
getView
(
'
Common.Views.Header
'
);
this
.
appOptions
.
canBranding
=
(
licType
!==
Asc
.
c_oLicenseResult
.
Error
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
this
.
appOptions
.
canBranding
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
if
(
this
.
appOptions
.
canBranding
)
headerView
.
setBranding
(
this
.
editorConfig
.
customization
);
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
518c4212
...
...
@@ -752,7 +752,7 @@ define([
this
.
permissions
.
edit
=
false
;
this
.
appOptions
.
isOffline
=
this
.
api
.
asc_isOffline
();
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
);
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
||
licType
===
Asc
.
c_oLicenseResult
.
SuccessLimit
);
this
.
appOptions
.
isLightVersion
=
params
.
asc_getIsLight
();
/** coauthoring begin **/
this
.
appOptions
.
canCoAuthoring
=
!
this
.
appOptions
.
isLightVersion
;
...
...
@@ -763,15 +763,15 @@ define([
this
.
appOptions
.
isEdit
=
this
.
appOptions
.
canLicense
&&
this
.
appOptions
.
canEdit
&&
this
.
editorConfig
.
mode
!==
'
view
'
;
this
.
appOptions
.
canDownload
=
!
this
.
appOptions
.
nativeApp
&&
this
.
permissions
.
download
!==
false
;
this
.
appOptions
.
canAnalytics
=
params
.
asc_getIsAnalyticsEnable
();
this
.
appOptions
.
canComments
=
this
.
appOptions
.
canLicense
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canComments
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canPrint
=
(
this
.
permissions
.
print
!==
false
);
this
.
appOptions
.
canRename
=
!!
this
.
permissions
.
rename
;
this
.
_state
.
licenseWarning
=
(
licType
===
Asc
.
c_oLicenseResult
.
Connections
)
&&
this
.
appOptions
.
canEdit
&&
this
.
editorConfig
.
mode
!==
'
view
'
;
var
headerView
=
this
.
getApplication
().
getController
(
'
Viewport
'
).
getView
(
'
Common.Views.Header
'
);
this
.
appOptions
.
canBranding
=
(
licType
!==
Asc
.
c_oLicenseResult
.
Error
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
this
.
appOptions
.
canBranding
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
if
(
this
.
appOptions
.
canBranding
)
headerView
.
setBranding
(
this
.
editorConfig
.
customization
);
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
518c4212
...
...
@@ -777,16 +777,16 @@ define([
this
.
appOptions
.
canAnalytics
=
params
.
asc_getIsAnalyticsEnable
();
this
.
appOptions
.
isOffline
=
this
.
api
.
asc_isOffline
();
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
);
this
.
appOptions
.
canLicense
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
||
licType
===
Asc
.
c_oLicenseResult
.
SuccessLimit
);
this
.
appOptions
.
isLightVersion
=
params
.
asc_getIsLight
();
/** coauthoring begin **/
this
.
appOptions
.
canCoAuthoring
=
!
this
.
appOptions
.
isLightVersion
;
/** coauthoring end **/
this
.
appOptions
.
canComments
=
this
.
appOptions
.
canLicense
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canComments
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
comments
===
false
);
this
.
appOptions
.
canChat
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
!
this
.
appOptions
.
isOffline
&&
!
((
typeof
(
this
.
editorConfig
.
customization
)
==
'
object
'
)
&&
this
.
editorConfig
.
customization
.
chat
===
false
);
this
.
appOptions
.
canRename
=
!!
this
.
permissions
.
rename
;
this
.
appOptions
.
canBranding
=
(
licType
!==
Asc
.
c_oLicenseResult
.
Error
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
this
.
appOptions
.
canBranding
=
(
licType
===
Asc
.
c_oLicenseResult
.
Success
)
&&
(
typeof
this
.
editorConfig
.
customization
==
'
object
'
);
if
(
this
.
appOptions
.
canBranding
)
this
.
headerView
.
setBranding
(
this
.
editorConfig
.
customization
);
...
...
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