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

bug 53426

Browse source
This commit is contained in:
OVSharova 2021-11-10 01:12:01 +03:00
parent 74863d99c6
commit 5c28d34f07
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -360,7 +360,7 @@ define([
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
} }
if (e.type !== 'click') if (e.type !== 'click')
me.btnChangeShape.menu.hide(); me.btnCrop.menu.hide();
}); });
}, },

5
apps/presentationeditor/main/app/view/ImageSettings.js
View file

@ -282,7 +282,7 @@ define([
fillAutoShapes: function() { fillAutoShapes: function() {
var me = this, var me = this,
recents = Common.localStorage.getItem('de-recent-shapes'); recents = Common.localStorage.getItem('pe-recent-shapes');
var menuitem = new Common.UI.MenuItem({ var menuitem = new Common.UI.MenuItem({
template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'), template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'),
@ -302,11 +302,12 @@ define([
}); });
shapePicker.on('item:click', function(picker, item, record, e) { shapePicker.on('item:click', function(picker, item, record, e) {
if (me.api) { if (me.api) {
PE.getController('Toolbar').toolbar.cmbInsertShape.updateComboView(record);
me.api.ChangeShapeType(record.get('data').shapeType); me.api.ChangeShapeType(record.get('data').shapeType);
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
} }
if (e.type !== 'click') if (e.type !== 'click')
me.btnChangeShape.menu.hide(); me.btnCrop.menu.hide();
}); });
}, },

4
apps/spreadsheeteditor/main/app/view/ImageSettings.js
View file

@ -372,7 +372,7 @@ define([
fillAutoShapes: function() { fillAutoShapes: function() {
var me = this, var me = this,
recents = Common.localStorage.getItem('de-recent-shapes'); recents = Common.localStorage.getItem('sse-recent-shapes');
var menuitem = new Common.UI.MenuItem({ var menuitem = new Common.UI.MenuItem({
template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'), template: _.template('<div id="id-img-change-shape-menu" class="menu-insertshape"></div>'),
@ -396,7 +396,7 @@ define([
Common.NotificationCenter.trigger('edit:complete', me); Common.NotificationCenter.trigger('edit:complete', me);
} }
if (e.type !== 'click') if (e.type !== 'click')
me.btnChangeShape.menu.hide(); me.btnCrop.menu.hide();
}); });
}, },