From cc4790ff70de7aaaeaac730154ee4f55801ac0c4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 27 Feb 2019 14:51:52 +0300 Subject: [PATCH] [SSE] Fix context menu for image/shape when image/shape is selected after plugin object --- apps/documenteditor/main/app/view/DocumentHolder.js | 1 + apps/presentationeditor/main/app/view/DocumentHolder.js | 1 + apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 ++ apps/spreadsheeteditor/main/app/view/DocumentHolder.js | 1 + 4 files changed, 5 insertions(+) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 353e5f241..1b92f77e2 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2370,6 +2370,7 @@ define([ caption: this.textRotate270, value : 0 }).on('click', _.bind(me.onImgRotate, me)), + { caption: '--' }, new Common.UI.MenuItem({ caption: this.textFlipH, value : 1 diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 528e2258a..f1455e100 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -2807,6 +2807,7 @@ define([ caption: me.textRotate270, value : 0 }).on('click', _.bind(onImgRotate, me)), + { caption: '--' }, new Common.UI.MenuItem({ caption: me.textFlipH, value : 1 diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index 5b5fcb140..b544f991b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1468,6 +1468,8 @@ define([ if (!documentHolder.imgMenu || !showMenu && !documentHolder.imgMenu.isVisible()) return; isimagemenu = isshapemenu = ischartmenu = false; + documentHolder.mnuImgAdvanced.imageInfo = undefined; + var has_chartprops = false, signGuid; var selectedObjects = this.api.asc_getGraphicObjectProps(); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index f2714ebd2..6ed0e2be7 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -704,6 +704,7 @@ define([ type : 'rotate', value : 0 }), + { caption: '--' }, new Common.UI.MenuItem({ caption: me.textFlipH, type : 'flip',