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

[DE PE SSE] Fix shape menu

Browse source
This commit is contained in:
JuliaSvinareva 2022-01-17 19:44:25 +03:00
parent 04d67d5612
commit 49e7293e2b
9 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2670,7 +2670,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.getApplication().getCollection('ShapeGroups'), groups: me.getApplication().getCollection('ShapeGroups'),
parentMenu: me.toolbar.btnInsertShape.menu, parentMenu: me.toolbar.btnInsertShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null recentShapes: recents ? JSON.parse(recents) : null
}); });

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

@ -349,7 +349,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
isFromImage: true isFromImage: true

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

@ -1852,7 +1852,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal,

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

@ -295,7 +295,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
isFromImage: true isFromImage: true

2
apps/presentationeditor/main/app/view/ShapeSettings.js
View file

@ -1697,7 +1697,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal,

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

@ -1075,7 +1075,7 @@ define([
style: 'min-width: 140px;', style: 'min-width: 140px;',
itemWidth: 20, itemWidth: 20,
itemHeight: 20, itemHeight: 20,
menuMaxHeight: 640, menuMaxHeight: 652,
menuWidth: 362, menuWidth: 362,
enableKeyEvents: true, enableKeyEvents: true,
lock: [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], lock: [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
@ -1752,7 +1752,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: collection, groups: collection,
parentMenu: menuShape, parentMenu: menuShape,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents recentShapes: recents
}); });

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -3188,7 +3188,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.getApplication().getCollection('ShapeGroups'), groups: me.getApplication().getCollection('ShapeGroups'),
parentMenu: me.toolbar.btnInsertShape.menu, parentMenu: me.toolbar.btnInsertShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null recentShapes: recents ? JSON.parse(recents) : null
}); });

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

@ -385,7 +385,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
isFromImage: true isFromImage: true

2
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1705,7 +1705,7 @@ define([
itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'), itemTemplate: _.template('<div class="item-shape" id="<%= id %>"><svg width="20" height="20" class=\"icon\"><use xlink:href=\"#svg-icon-<%= data.shapeType %>\"></use></svg></div>'),
groups: me.application.getCollection('ShapeGroups'), groups: me.application.getCollection('ShapeGroups'),
parentMenu: me.btnChangeShape.menu, parentMenu: me.btnChangeShape.menu,
restoreHeight: 640, restoreHeight: 652,
textRecentlyUsed: me.textRecentlyUsed, textRecentlyUsed: me.textRecentlyUsed,
recentShapes: recents ? JSON.parse(recents) : null, recentShapes: recents ? JSON.parse(recents) : null,
hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal, hideTextRect: me._state.isFromImage || me._state.isFromSmartArtInternal,