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
4cbd0ad7
Commit
4cbd0ad7
authored
Aug 16, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
In light version default value for Autosave is off.
parent
7a5e775d
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
24 deletions
+25
-24
apps/documenteditor/main/app/controller/LeftMenu.js
apps/documenteditor/main/app/controller/LeftMenu.js
+1
-1
apps/documenteditor/main/app/controller/Main.js
apps/documenteditor/main/app/controller/Main.js
+4
-3
apps/documenteditor/main/app/view/FileMenuPanels.js
apps/documenteditor/main/app/view/FileMenuPanels.js
+4
-4
apps/presentationeditor/main/app/controller/LeftMenu.js
apps/presentationeditor/main/app/controller/LeftMenu.js
+1
-1
apps/presentationeditor/main/app/controller/Main.js
apps/presentationeditor/main/app/controller/Main.js
+3
-3
apps/presentationeditor/main/app/view/FileMenuPanels.js
apps/presentationeditor/main/app/view/FileMenuPanels.js
+4
-4
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
+1
-1
apps/spreadsheeteditor/main/app/controller/Main.js
apps/spreadsheeteditor/main/app/controller/Main.js
+3
-3
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+4
-4
No files found.
apps/documenteditor/main/app/controller/LeftMenu.js
View file @
4cbd0ad7
...
...
@@ -274,7 +274,7 @@ define([
this
.
api
.
SetTextBoxInputMode
(
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
{
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-coauthmode
"
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
this
.
api
.
asc_SetFastCollaborative
(
fast_coauth
);
...
...
apps/documenteditor/main/app/controller/Main.js
View file @
4cbd0ad7
...
...
@@ -795,7 +795,7 @@ define([
me
.
api
.
SetTextBoxInputMode
(
value
!==
null
&&
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
)
{
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-coauthmode
"
);
me
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
me
.
api
.
asc_SetFastCollaborative
(
me
.
_state
.
fastCoauth
);
...
...
@@ -846,7 +846,8 @@ define([
if
(
me
.
appOptions
.
isEdit
)
{
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-autosave
"
);
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
1
;
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
(
me
.
appOptions
.
canCoAuthoring
?
1
:
0
);
me
.
api
.
asc_setAutoSaveGap
(
value
);
if
(
me
.
needToUpdateVersion
)
...
...
@@ -1655,7 +1656,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
)
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
var
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-coauthmode
"
),
oldval
=
this
.
_state
.
fastCoauth
;
this
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
...
...
apps/documenteditor/main/app/view/FileMenuPanels.js
View file @
4cbd0ad7
...
...
@@ -312,7 +312,7 @@ define([
}
/** coauthoring begin **/
$
(
'
tr.coauth
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
/** coauthoring end **/
},
...
...
@@ -329,7 +329,7 @@ define([
this
.
chLiveComment
.
setValue
(
!
(
value
!==
null
&&
parseInt
(
value
)
==
0
));
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-coauthmode
"
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
)
&&
this
.
mode
.
canCoAuthoring
;
item
=
this
.
cmbCoAuthMode
.
store
.
findWhere
({
value
:
parseInt
(
value
)});
this
.
cmbCoAuthMode
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
1
);
...
...
@@ -352,7 +352,7 @@ define([
this
.
_oldUnits
=
this
.
cmbUnit
.
getValue
();
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-autosave
"
);
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
||
parseInt
(
value
)
==
1
));
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
?
this
.
mode
.
canCoAuthoring
:
parseInt
(
value
)
==
1
));
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-spellcheck
"
);
this
.
chSpell
.
setValue
(
value
===
null
||
parseInt
(
value
)
==
1
);
...
...
@@ -366,7 +366,7 @@ define([
Common
.
localStorage
.
setItem
(
"
de-settings-zoom
"
,
this
.
cmbZoom
.
getValue
());
/** coauthoring begin **/
Common
.
localStorage
.
setItem
(
"
de-settings-livecomment
"
,
this
.
chLiveComment
.
isChecked
()
?
1
:
0
);
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
{
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
Common
.
localStorage
.
setItem
(
"
de-settings-coauthmode
"
,
this
.
cmbCoAuthMode
.
getValue
());
Common
.
localStorage
.
setItem
(
this
.
cmbCoAuthMode
.
getValue
()
?
"
de-settings-showchanges-fast
"
:
"
de-settings-showchanges-strict
"
,
this
.
cmbShowChanges
.
getValue
());
}
...
...
apps/presentationeditor/main/app/controller/LeftMenu.js
View file @
4cbd0ad7
...
...
@@ -210,7 +210,7 @@ define([
this
.
api
.
SetTextBoxInputMode
(
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
{
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-coauthmode
"
);
this
.
api
.
asc_SetFastCollaborative
(
value
===
null
||
parseInt
(
value
)
==
1
);
}
...
...
apps/presentationeditor/main/app/controller/Main.js
View file @
4cbd0ad7
...
...
@@ -591,7 +591,7 @@ define([
me
.
api
.
SetTextBoxInputMode
(
value
!==
null
&&
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
)
{
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-coauthmode
"
);
me
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
}
else
...
...
@@ -630,7 +630,7 @@ define([
if
(
me
.
appOptions
.
isEdit
)
{
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-autosave
"
);
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
1
;
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
(
me
.
appOptions
.
canCoAuthoring
?
1
:
0
)
;
me
.
api
.
asc_setAutoSaveGap
(
value
);
if
(
me
.
needToUpdateVersion
)
...
...
@@ -1432,7 +1432,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
)
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
var
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-coauthmode
"
),
oldval
=
this
.
_state
.
fastCoauth
;
this
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
...
...
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file @
4cbd0ad7
...
...
@@ -258,7 +258,7 @@ define([
this
.
lblAutosave
.
text
(
this
.
textAutoRecover
);
}
/** coauthoring begin **/
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
/** coauthoring end **/
},
...
...
@@ -273,7 +273,7 @@ define([
/** coauthoring begin **/
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-coauthmode
"
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
)
&&
this
.
mode
.
canCoAuthoring
;
item
=
this
.
cmbCoAuthMode
.
store
.
findWhere
({
value
:
parseInt
(
value
)});
this
.
cmbCoAuthMode
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
1
);
...
...
@@ -286,7 +286,7 @@ define([
this
.
_oldUnits
=
this
.
cmbUnit
.
getValue
();
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-autosave
"
);
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
||
parseInt
(
value
)
==
1
));
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
?
this
.
mode
.
canCoAuthoring
:
parseInt
(
value
)
==
1
));
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-showsnaplines
"
);
this
.
chAlignGuides
.
setValue
(
value
===
null
||
parseInt
(
value
)
==
1
);
...
...
@@ -296,7 +296,7 @@ define([
Common
.
localStorage
.
setItem
(
"
pe-settings-inputmode
"
,
this
.
chInputMode
.
isChecked
()
?
1
:
0
);
Common
.
localStorage
.
setItem
(
"
pe-settings-zoom
"
,
this
.
cmbZoom
.
getValue
());
/** coauthoring begin **/
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
{
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
Common
.
localStorage
.
setItem
(
"
pe-settings-coauthmode
"
,
this
.
cmbCoAuthMode
.
getValue
());
}
/** coauthoring end **/
...
...
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file @
4cbd0ad7
...
...
@@ -244,7 +244,7 @@ define([
(
!
(
value
!==
null
&&
parseInt
(
value
)
==
0
))
?
this
.
api
.
asc_showComments
()
:
this
.
api
.
asc_hideComments
();
// this.getApplication().getController('DocumentHolder').setLiveCommenting(!(value!==null && parseInt(value) == 0));
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
{
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-coauthmode
"
);
this
.
api
.
asc_SetFastCollaborative
(
value
===
null
||
parseInt
(
value
)
==
1
);
}
...
...
apps/spreadsheeteditor/main/app/controller/Main.js
View file @
4cbd0ad7
...
...
@@ -559,7 +559,7 @@ define([
this
.
isLiveCommenting
=
!
(
value
!==
null
&&
parseInt
(
value
)
==
0
);
this
.
isLiveCommenting
?
this
.
api
.
asc_showComments
():
this
.
api
.
asc_hideComments
();
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
)
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-coauthmode
"
);
this
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
}
else
...
...
@@ -619,7 +619,7 @@ define([
if
(
me
.
appOptions
.
isEdit
)
{
if
(
me
.
appOptions
.
canAutosave
)
{
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-autosave
"
);
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
1
;
value
=
(
!
me
.
_state
.
fastCoauth
&&
value
!==
null
)
?
parseInt
(
value
)
:
(
me
.
appOptions
.
canCoAuthoring
?
1
:
0
)
;
}
else
{
value
=
0
;
}
...
...
@@ -1652,7 +1652,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
)
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
var
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-coauthmode
"
),
oldval
=
this
.
_state
.
fastCoauth
;
this
.
_state
.
fastCoauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
);
...
...
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file @
4cbd0ad7
...
...
@@ -651,7 +651,7 @@ define([
this
.
lblAutosave
.
text
(
this
.
textAutoRecover
);
}
$
(
'
tr.coauth
'
,
this
.
el
)[
mode
.
canCoAuthoring
&&
mode
.
isEdit
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
},
setApi
:
function
(
api
)
{
...
...
@@ -668,7 +668,7 @@ define([
this
.
chLiveComment
.
setValue
(
!
(
value
!==
null
&&
parseInt
(
value
)
==
0
));
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-coauthmode
"
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
);
var
fast_coauth
=
(
value
===
null
||
parseInt
(
value
)
==
1
)
&&
!
(
this
.
mode
.
isDesktopApp
&&
this
.
mode
.
isOffline
)
&&
this
.
mode
.
canCoAuthoring
;
item
=
this
.
cmbCoAuthMode
.
store
.
findWhere
({
value
:
parseInt
(
value
)});
this
.
cmbCoAuthMode
.
setValue
(
item
?
item
.
get
(
'
value
'
)
:
1
);
...
...
@@ -685,7 +685,7 @@ define([
this
.
_oldUnits
=
this
.
cmbUnit
.
getValue
();
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-autosave
"
);
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
||
parseInt
(
value
)
==
1
));
this
.
chAutosave
.
setValue
(
fast_coauth
||
(
value
===
null
?
this
.
mode
.
canCoAuthoring
:
parseInt
(
value
)
==
1
));
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-func-locale
"
);
if
(
value
===
null
)
...
...
@@ -726,7 +726,7 @@ define([
Common
.
localStorage
.
setItem
(
"
sse-settings-zoom
"
,
this
.
cmbZoom
.
getValue
());
/** coauthoring begin **/
Common
.
localStorage
.
setItem
(
"
sse-settings-livecomment
"
,
this
.
chLiveComment
.
isChecked
()
?
1
:
0
);
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
)
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
Common
.
localStorage
.
setItem
(
"
sse-settings-coauthmode
"
,
this
.
cmbCoAuthMode
.
getValue
());
/** coauthoring end **/
Common
.
localStorage
.
setItem
(
"
sse-settings-fontrender
"
,
this
.
cmbFontRender
.
getValue
());
...
...
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