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
d7b05c7a
Commit
d7b05c7a
authored
Aug 30, 2016
by
Julia Radzhabova
Committed by
GitHub
Aug 30, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #20 from ONLYOFFICE/release/v4.1.0
Fix Bug 33031.
parents
1fbebd0d
20a70db9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
11 deletions
+12
-11
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+12
-11
No files found.
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
d7b05c7a
...
...
@@ -733,18 +733,19 @@ define([
},
onEditorPermissions
:
function
(
params
)
{
var
licType
=
params
.
asc_getLicenseType
();
if
(
Asc
.
c_oLicenseResult
.
Expired
===
licType
||
Asc
.
c_oLicenseResult
.
Error
===
licType
)
{
Common
.
UI
.
warning
({
title
:
this
.
titleLicenseExp
,
msg
:
this
.
warnLicenseExp
,
buttons
:
[],
closable
:
false
});
return
;
}
var
licType
=
params
?
params
.
asc_getLicenseType
()
:
Asc
.
c_oLicenseResult
.
Error
;
if
(
params
&&
!
(
this
.
appOptions
.
isEditDiagram
||
this
.
appOptions
.
isEditMailMerge
))
{
if
(
Asc
.
c_oLicenseResult
.
Expired
===
licType
||
Asc
.
c_oLicenseResult
.
Error
===
licType
)
{
Common
.
UI
.
warning
({
title
:
this
.
titleLicenseExp
,
msg
:
this
.
warnLicenseExp
,
buttons
:
[],
closable
:
false
});
return
;
}
if
(
params
&&
!
(
this
.
appOptions
.
isEditDiagram
||
this
.
appOptions
.
isEditMailMerge
))
{
this
.
appOptions
.
canAutosave
=
true
;
this
.
appOptions
.
canAnalytics
=
params
.
asc_getIsAnalyticsEnable
();
...
...
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