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

[DE PE SSE] Fix smart arts

Browse source
This commit is contained in:
JuliaSvinareva 2022-10-12 15:28:33 +03:00
parent a2e62b7545
commit 72886c7837
1 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -787,7 +787,6 @@ define([
lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode,
_set.lostConnect, _set.disableOnStart], _set.lostConnect, _set.disableOnStart],
caption: me.capBtnInsSmartArt, caption: me.capBtnInsSmartArt,
enableToggle: true,
menu: true, menu: true,
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
@ -2223,6 +2222,11 @@ define([
var smartArtData = Common.define.smartArt.getSmartArtData(); var smartArtData = Common.define.smartArt.getSmartArtData();
smartArtData.forEach(function (item, index) { smartArtData.forEach(function (item, index) {
var length = item.items.length,
width = 399;
if (length < 5) {
width = length * (70 + 8) + 9; // 4px margin + 4px margin
}
me.btnInsertSmartArt.menu.addItem({ me.btnInsertSmartArt.menu.addItem({
caption: item.caption, caption: item.caption,
value: item.sectionId, value: item.sectionId,
@ -2230,7 +2234,7 @@ define([
iconCls: item.icon ? 'menu__icon ' + item.icon : undefined, iconCls: item.icon ? 'menu__icon ' + item.icon : undefined,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{template: _.template('<div id="' + item.id + '" class="menu-add-smart-art" style="width: 400px; height: 500px; margin-left: 5px;"></div>')} {template: _.template('<div id="' + item.id + '" class="menu-add-smart-art" style="width: ' + width + 'px; height: 500px; margin-left: 5px;"></div>')}
], ],
menuAlign: 'tl-tr', menuAlign: 'tl-tr',
})}); })});
@ -2251,21 +2255,13 @@ define([
].join('')), ].join('')),
store: new Common.UI.DataViewStore(), store: new Common.UI.DataViewStore(),
delayRenderTips: true, delayRenderTips: true,
scrollAlwaysVisible: true scrollAlwaysVisible: true,
showLast: false
}); });
item.menuPicker.on('item:click', function(picker, item, record, e) { item.menuPicker.on('item:click', function(picker, item, record, e) {
if (record) { if (record) {
me.fireEvent('insert:smartart', [record.get('value')]); me.fireEvent('insert:smartart', [record.get('value')]);
} }
me.btnInsertSmartArt.toggle(false, true);
if (me.btnInsertText.pressed) {
me.btnInsertText.toggle(false, true);
}
if (me.btnInsertShape.pressed) {
me.btnInsertShape.toggle(false, true);
}
if (e.type !== 'click')
me.btnInsertSmartArt.menu.hide();
Common.NotificationCenter.trigger('edit:complete', me); Common.NotificationCenter.trigger('edit:complete', me);
}); });
}); });