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
a2c03c3e
Commit
a2c03c3e
authored
Dec 20, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show co-authoring mode settings regardless of the license.
parent
8175061c
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
15 additions
and
15 deletions
+15
-15
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
+2
-2
apps/documenteditor/main/app/view/FileMenuPanels.js
apps/documenteditor/main/app/view/FileMenuPanels.js
+2
-2
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
+2
-2
apps/presentationeditor/main/app/view/FileMenuPanels.js
apps/presentationeditor/main/app/view/FileMenuPanels.js
+2
-2
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
+2
-2
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
+2
-2
No files found.
apps/documenteditor/main/app/controller/LeftMenu.js
View file @
a2c03c3e
...
...
@@ -283,7 +283,7 @@ define([
this
.
api
.
SetTextBoxInputMode
(
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
if
(
this
.
mode
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -822,7 +822,7 @@ define([
me
.
api
.
SetTextBoxInputMode
(
value
!==
null
&&
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
if
(
me
.
appOptions
.
isEdit
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
de-settings-coauthmode
"
);
if
(
value
===
null
&&
Common
.
localStorage
.
getItem
(
"
de-settings-autosave
"
)
===
null
&&
me
.
appOptions
.
customization
&&
me
.
appOptions
.
customization
.
autosave
===
false
)
{
...
...
@@ -1755,7 +1755,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
if
(
this
.
appOptions
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -315,7 +315,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
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
/** coauthoring end **/
},
...
...
@@ -375,7 +375,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
&&
this
.
mode
.
canCoAuthoring
)
{
if
(
this
.
mode
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -231,7 +231,7 @@ define([
this
.
api
.
SetTextBoxInputMode
(
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
this
.
mode
.
isEdit
&&
this
.
mode
.
canLicense
&&
!
this
.
mode
.
isOffline
&&
this
.
mode
.
canCoAuthoring
)
{
if
(
this
.
mode
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -610,7 +610,7 @@ define([
me
.
api
.
SetTextBoxInputMode
(
value
!==
null
&&
parseInt
(
value
)
==
1
);
/** coauthoring begin **/
if
(
me
.
appOptions
.
isEdit
&&
me
.
appOptions
.
canLicense
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
if
(
me
.
appOptions
.
isEdit
&&
!
me
.
appOptions
.
isOffline
&&
me
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
pe-settings-coauthmode
"
);
if
(
value
===
null
&&
Common
.
localStorage
.
getItem
(
"
pe-settings-autosave
"
)
===
null
&&
me
.
appOptions
.
customization
&&
me
.
appOptions
.
customization
.
autosave
===
false
)
{
...
...
@@ -1510,7 +1510,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
if
(
this
.
appOptions
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -260,7 +260,7 @@ define([
this
.
lblAutosave
.
text
(
this
.
textAutoRecover
);
}
/** coauthoring begin **/
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
mode
.
canLicense
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
/** coauthoring end **/
},
...
...
@@ -303,7 +303,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
&&
this
.
mode
.
canCoAuthoring
)
{
if
(
this
.
mode
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -257,7 +257,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
&&
this
.
mode
.
canCoAuthoring
)
{
if
(
this
.
mode
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -581,7 +581,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
&&
this
.
appOptions
.
canCoAuthoring
)
{
if
(
this
.
appOptions
.
isEdit
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
value
=
Common
.
localStorage
.
getItem
(
"
sse-settings-coauthmode
"
);
if
(
value
===
null
&&
Common
.
localStorage
.
getItem
(
"
sse-settings-autosave
"
)
===
null
&&
this
.
appOptions
.
customization
&&
this
.
appOptions
.
customization
.
autosave
===
false
)
{
...
...
@@ -1761,7 +1761,7 @@ define([
},
applySettings
:
function
()
{
if
(
this
.
appOptions
.
isEdit
&&
this
.
appOptions
.
canLicense
&&
!
this
.
appOptions
.
isOffline
&&
this
.
appOptions
.
canCoAuthoring
)
{
if
(
this
.
appOptions
.
isEdit
&&
!
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 @
a2c03c3e
...
...
@@ -652,7 +652,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
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
$
(
'
tr.coauth.changes
'
,
this
.
el
)[
mode
.
isEdit
&&
!
mode
.
isOffline
&&
mode
.
canCoAuthoring
?
'
show
'
:
'
hide
'
]();
},
setApi
:
function
(
api
)
{
...
...
@@ -733,7 +733,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
&&
this
.
mode
.
canCoAuthoring
)
if
(
this
.
mode
.
isEdit
&&
!
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