From 49e7293e2b3e7c1390e2a7d1c18ede6c50888b96 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Mon, 17 Jan 2022 19:44:25 +0300 Subject: [PATCH] [DE PE SSE] Fix shape menu --- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- apps/documenteditor/main/app/view/ImageSettings.js | 2 +- apps/documenteditor/main/app/view/ShapeSettings.js | 2 +- apps/presentationeditor/main/app/view/ImageSettings.js | 2 +- apps/presentationeditor/main/app/view/ShapeSettings.js | 2 +- apps/presentationeditor/main/app/view/Toolbar.js | 4 ++-- apps/spreadsheeteditor/main/app/controller/Toolbar.js | 2 +- apps/spreadsheeteditor/main/app/view/ImageSettings.js | 2 +- apps/spreadsheeteditor/main/app/view/ShapeSettings.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 1f066fe0e..170f30824 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2670,7 +2670,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.getApplication().getCollection('ShapeGroups'), parentMenu: me.toolbar.btnInsertShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null }); diff --git a/apps/documenteditor/main/app/view/ImageSettings.js b/apps/documenteditor/main/app/view/ImageSettings.js index eb9123037..75bf8e06e 100644 --- a/apps/documenteditor/main/app/view/ImageSettings.js +++ b/apps/documenteditor/main/app/view/ImageSettings.js @@ -349,7 +349,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, isFromImage: true diff --git a/apps/documenteditor/main/app/view/ShapeSettings.js b/apps/documenteditor/main/app/view/ShapeSettings.js index 643dd0df4..b832fc750 100644 --- a/apps/documenteditor/main/app/view/ShapeSettings.js +++ b/apps/documenteditor/main/app/view/ShapeSettings.js @@ -1852,7 +1852,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal, diff --git a/apps/presentationeditor/main/app/view/ImageSettings.js b/apps/presentationeditor/main/app/view/ImageSettings.js index cad43e7c9..551e5b743 100644 --- a/apps/presentationeditor/main/app/view/ImageSettings.js +++ b/apps/presentationeditor/main/app/view/ImageSettings.js @@ -295,7 +295,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, isFromImage: true diff --git a/apps/presentationeditor/main/app/view/ShapeSettings.js b/apps/presentationeditor/main/app/view/ShapeSettings.js index 1686ac0f7..236a161b8 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettings.js +++ b/apps/presentationeditor/main/app/view/ShapeSettings.js @@ -1697,7 +1697,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal, diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 87c83bc21..20090695f 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1075,7 +1075,7 @@ define([ style: 'min-width: 140px;', itemWidth: 20, itemHeight: 20, - menuMaxHeight: 640, + menuMaxHeight: 652, menuWidth: 362, enableKeyEvents: true, lock: [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], @@ -1752,7 +1752,7 @@ define([ itemTemplate: _.template('
\">
'), groups: collection, parentMenu: menuShape, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents }); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 9881ce9fb..b85de925e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3188,7 +3188,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.getApplication().getCollection('ShapeGroups'), parentMenu: me.toolbar.btnInsertShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null }); diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettings.js b/apps/spreadsheeteditor/main/app/view/ImageSettings.js index 5fdf7fb1b..bf2f3aa9a 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettings.js @@ -385,7 +385,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, isFromImage: true diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js index 87c9f1e7b..3cb0252cb 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettings.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettings.js @@ -1705,7 +1705,7 @@ define([ itemTemplate: _.template('
\">
'), groups: me.application.getCollection('ShapeGroups'), parentMenu: me.btnChangeShape.menu, - restoreHeight: 640, + restoreHeight: 652, textRecentlyUsed: me.textRecentlyUsed, recentShapes: recents ? JSON.parse(recents) : null, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal,