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
0e9e74f2
Commit
0e9e74f2
authored
Sep 22, 2017
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PE] Fix Bug 35469, Fix Bug 35449.
parent
2e38df4f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
apps/presentationeditor/main/app/controller/Toolbar.js
apps/presentationeditor/main/app/controller/Toolbar.js
+1
-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 @
0e9e74f2
...
...
@@ -581,7 +581,6 @@ define([
paragraph_locked
=
pr
.
get_Locked
();
no_paragraph
=
false
;
no_text
=
false
;
no_object
=
false
;
}
else
if
(
type
==
Asc
.
c_oAscTypeSelectElement
.
Slide
)
{
slide_deleted
=
pr
.
get_LockDelete
();
slide_layout_lock
=
pr
.
get_LockLayout
();
...
...
@@ -625,7 +624,7 @@ define([
if
(
this
.
_state
.
no_object
!==
no_object
)
{
if
(
this
.
_state
.
activated
)
this
.
_state
.
no_object
=
no_object
;
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
noObjectSelected
,
no_object
,
{
array
:
[
me
.
toolbar
.
btnShapeAlign
,
me
.
toolbar
.
btnShapeArrange
]});
this
.
toolbar
.
lockToolbar
(
PE
.
enumLock
.
noObjectSelected
,
no_object
,
{
array
:
[
me
.
toolbar
.
btnShapeAlign
,
me
.
toolbar
.
btnShapeArrange
,
me
.
toolbar
.
btnVerticalAlign
]});
}
if
(
slide_layout_lock
!==
undefined
&&
this
.
_state
.
slidelayoutdisable
!==
slide_layout_lock
)
{
...
...
apps/presentationeditor/main/app/view/Toolbar.js
View file @
0e9e74f2
...
...
@@ -442,7 +442,7 @@ define([
me
.
btnVerticalAlign
=
new
Common
.
UI
.
Button
({
id
:
'
id-toolbar-btn-valign
'
,
cls
:
'
btn-toolbar
'
,
lock
:
[
_set
.
slideDeleted
,
_set
.
paragraphLock
,
_set
.
lostConnect
,
_set
.
noSlides
,
_set
.
noParagraphSelected
],
lock
:
[
_set
.
slideDeleted
,
_set
.
paragraphLock
,
_set
.
lostConnect
,
_set
.
noSlides
,
_set
.
noParagraphSelected
,
_set
.
noObjectSelected
],
iconCls
:
'
btn-align-middle
'
,
icls
:
'
btn-align-middle
'
,
menu
:
new
Common
.
UI
.
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