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

[PE] Bug 35508

Browse source
This commit is contained in:
Julia Radzhabova 2019-10-02 11:07:14 +03:00
parent f68a6ee68b
commit e941f2c87d
2 changed files with 7 additions and 6 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

@ -661,7 +661,8 @@ define([
} else if (type == Asc.c_oAscTypeSelectElement.Image || type == Asc.c_oAscTypeSelectElement.Shape || type == Asc.c_oAscTypeSelectElement.Chart || type == Asc.c_oAscTypeSelectElement.Table) {
shape_locked = pr.get_Locked();
no_object = false;
if (type !== Asc.c_oAscTypeSelectElement.Image) {
if (type == Asc.c_oAscTypeSelectElement.Table ||
type == Asc.c_oAscTypeSelectElement.Shape && !pr.get_FromImage() && !pr.get_FromChart()) {
no_text = false;
}
in_chart = type == Asc.c_oAscTypeSelectElement.Chart;

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

@ -353,7 +353,7 @@ define([
id: 'id-toolbar-btn-markers',
cls: 'btn-toolbar',
iconCls: 'btn-setmarkers',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -365,7 +365,7 @@ define([
id: 'id-toolbar-btn-numbering',
cls: 'btn-toolbar',
iconCls: 'btn-numbering',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
enableToggle: true,
toggleGroup: 'markersGroup',
split: true,
@ -393,7 +393,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'btn-align-left',
icls: 'btn-align-left',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
menu: new Common.UI.Menu({
items: [
{
@ -437,7 +437,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, _set.noObjectSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.noObjectSelected],
iconCls: 'btn-align-middle',
icls: 'btn-align-middle',
menu: new Common.UI.Menu({
@ -492,7 +492,7 @@ define([
id: 'id-toolbar-btn-linespace',
cls: 'btn-toolbar',
iconCls: 'btn-linespace',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
menu: new Common.UI.Menu({
style: 'min-width: 60px;',
items: [