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
fe3a83fd
Commit
fe3a83fd
authored
Mar 29, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE] Strict co-editing: lock themes control when other users changed theme.
parent
2c5ec679
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+2
-2
apps/presentationeditor/main/app/view/Toolbar.js
apps/presentationeditor/main/app/view/Toolbar.js
+1
-1
No files found.
apps/presentationeditor/main/app/controller/Toolbar.js
View file @
fe3a83fd
...
...
@@ -697,11 +697,11 @@ define([
},
onApiLockDocumentTheme
:
function
()
{
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
themeLock
,
true
,
{
array
:
[
this
.
toolbar
.
btnColorSchemas
]});
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
themeLock
,
true
,
{
array
:
[
this
.
toolbar
.
btnColorSchemas
,
this
.
toolbar
.
listTheme
]});
},
onApiUnLockDocumentTheme
:
function
()
{
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
themeLock
,
false
,
{
array
:
[
this
.
toolbar
.
btnColorSchemas
]});
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
themeLock
,
false
,
{
array
:
[
this
.
toolbar
.
btnColorSchemas
,
this
.
toolbar
.
listTheme
]});
},
onApiCoAuthoringDisconnect
:
function
(
disableDownload
)
{
...
...
apps/presentationeditor/main/app/view/Toolbar.js
View file @
fe3a83fd
...
...
@@ -855,7 +855,7 @@ define([
enableKeyEvents
:
true
,
itemHeight
:
38
,
hint
:
this
.
tipSlideTheme
,
lock
:
[
_set
.
lostConnect
,
_set
.
noSlides
],
lock
:
[
_set
.
themeLock
,
_set
.
lostConnect
,
_set
.
noSlides
],
beforeOpenHandler
:
function
(
e
)
{
var
cmp
=
this
,
menu
=
cmp
.
openButton
.
menu
,
...
...
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