Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] Fix Bug 35469, Fix Bug 35449.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-04 11:49:38 +03:00
parent 0a3b92e1ef
commit 70bd42d4f7
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -635,7 +635,6 @@ define([
paragraph_locked = pr.get_Locked(); paragraph_locked = pr.get_Locked();
no_paragraph = false; no_paragraph = false;
no_text = false; no_text = false;
no_object = false;
} else if (type == Asc.c_oAscTypeSelectElement.Slide) { } else if (type == Asc.c_oAscTypeSelectElement.Slide) {
slide_deleted = pr.get_LockDelete(); slide_deleted = pr.get_LockDelete();
slide_layout_lock = pr.get_LockLayout(); slide_layout_lock = pr.get_LockLayout();
@ -679,7 +678,7 @@ define([
if (this._state.no_object !== no_object ) { if (this._state.no_object !== no_object ) {
if (this._state.activated) 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 ) { if (slide_layout_lock !== undefined && this._state.slidelayoutdisable !== slide_layout_lock ) {

2
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -466,7 +466,7 @@ define([
me.btnVerticalAlign = new Common.UI.Button({ me.btnVerticalAlign = new Common.UI.Button({
id : 'id-toolbar-btn-valign', id : 'id-toolbar-btn-valign',
cls : 'btn-toolbar', 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', iconCls : 'btn-align-middle',
icls : 'btn-align-middle', icls : 'btn-align-middle',
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({