pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 05:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PE] For Bug 62889

Browse Source
This commit is contained in:
Julia Radzhabova
2023-06-06 15:23:02 +03:00
parent b65a5a2a85
commit 30dfc65067
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/presentationeditor/main/app/controller/Toolbar.js
View File

@ -83,6 +83,7 @@ define([
no_paragraph: undefined,
no_text: undefined,
no_object: undefined,
no_drawing_objects: undefined,
clrtext: undefined,
linespace: undefined,
pralign: undefined,
@ -788,6 +789,7 @@ define([
no_paragraph = true,
no_text = true,
no_object = true,
no_drawing_objects = this.api.asc_getSelectedDrawingObjectsCount()<1,
in_equation = false,
in_chart = false,
layout_index = -1,
@ -863,14 +865,23 @@ define([
this.toolbar.lockToolbar(Common.enumLock.noTextSelected, no_text, {array: me.toolbar.paragraphControls});
}
if (this._state.no_object !== no_object ) {
if (this._state.activated) this._state.no_object = no_object;
this.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnVerticalAlign ]});
}
if (this._state.no_drawing_objects !== no_drawing_objects ) {
if (this._state.activated) this._state.no_drawing_objects = no_drawing_objects;
this.toolbar.lockToolbar(Common.enumLock.noDrawingObjects, no_drawing_objects, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange]});
}
if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) {
if (this._state.activated) this._state.shapecontrolsdisable = shape_locked;
this.toolbar.lockToolbar(Common.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)});
}
if (this._state.no_object !== no_object ) {
if (this._state.activated) this._state.no_object = no_object;
this.toolbar.lockToolbar(Common.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange, me.toolbar.btnVerticalAlign ]});
if (shape_locked===undefined && !this._state.no_drawing_objects) { // several tables selected
this.toolbar.lockToolbar(Common.enumLock.shapeLock, false, {array: me.toolbar.shapeControls});
}
if (slide_layout_lock !== undefined && this._state.slidelayoutdisable !== slide_layout_lock ) {

7
apps/presentationeditor/main/app/view/Toolbar.js
View File

@ -79,7 +79,8 @@ define([
themeLock: 'theme-lock',
menuFileOpen: 'menu-file-open',
noParagraphSelected: 'no-paragraph',
noObjectSelected: 'no-object',
noObjectSelected: 'no-object', // no objects in stack from asc_onFocusObject event
noDrawingObjects: 'no-drawing-object', // asc_getSelectedDrawingObjectsCount<1 (2 selected tables: noObjectSelected=true, noDrawingObjects = false)
disableOnStart: 'on-start',
cantPrint: 'cant-print',
noTextSelected: 'no-text',
@ -942,7 +943,7 @@ define([
id: 'id-toolbar-btn-shape-align',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-shape-align-left',
lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart],
lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noDrawingObjects, _set.disableOnStart],
menu: new Common.UI.Menu({
cls: 'shifted-right',
items: [
@ -995,7 +996,7 @@ define([
id: 'id-toolbar-btn-shape-arrange',
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-arrange-front',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart],
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noDrawingObjects, _set.disableOnStart],
menu: new Common.UI.Menu({
items: [
me.mnuArrangeFront = new Common.UI.MenuItem({