asc_onInitEditorShapes and get_PropertyEditorShapes -> asc_getPropertyEditorShapes

apps/documenteditor/main/app/controller/Main.js

@@ -697,7 +697,7 @@ define([
                                         documentHolderController.getView('DocumentHolder').changePosition();
                                         me.loadLanguages();
 
-                                        var shapes = me.api.get_PropertyEditorShapes();
+                                        var shapes = me.api.asc_getPropertyEditorShapes();
                                         if (shapes)
                                             me.fillAutoShapes(shapes[0], shapes[1]);
 
@@ -845,7 +845,7 @@ define([
 
                             rightmenuController.createDelayedElements();
 
-                            var shapes = me.api.get_PropertyEditorShapes();
+                            var shapes = me.api.asc_getPropertyEditorShapes();
                             if (shapes)
                                 me.fillAutoShapes(shapes[0], shapes[1]);
 

apps/presentationeditor/main/app/controller/Main.js

@@ -516,7 +516,7 @@ define([
                                         me.api.asc_registerCallback('asc_onFocusObject',        _.bind(me.onFocusObject, me));
                                         me.api.asc_registerCallback('asc_onUpdateLayout',       _.bind(me.fillLayoutsStore, me)); // slide layouts loading
                                         me.updateThemeColors();
-                                        var shapes = me.api.get_PropertyEditorShapes();
+                                        var shapes = me.api.asc_getPropertyEditorShapes();
                                         if (shapes)
                                             me.fillAutoShapes(shapes[0], shapes[1]);
                                         me.fillTextArt(me.api.asc_getTextArtPreviews());
@@ -641,7 +641,7 @@ define([
                             me.api.asc_registerCallback('asc_onFocusObject',        _.bind(me.onFocusObject, me));
                             me.api.asc_registerCallback('asc_onUpdateLayout',       _.bind(me.fillLayoutsStore, me)); // slide layouts loading
                             me.updateThemeColors();
-                            var shapes = me.api.get_PropertyEditorShapes();
+                            var shapes = me.api.asc_getPropertyEditorShapes();
                             if (shapes)
                                 me.fillAutoShapes(shapes[0], shapes[1]);
                             me.fillTextArt(me.api.asc_getTextArtPreviews());

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -504,11 +504,14 @@ define([
                                     application.getController('Statusbar').getView('Statusbar').update();
                                     application.getController('CellEditor').setMode(me.appOptions);
 
-                                    me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me));
                                     me.api.asc_registerCallback('asc_onSaveUrl', _.bind(me.onSaveUrl, me));
                                     me.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(me.onDocumentModifiedChanged, me));
                                     me.api.asc_registerCallback('asc_onDocumentCanSaveChanged',  _.bind(me.onDocumentCanSaveChanged, me));
                                     me.api.asc_registerCallback('asc_onDownloadUrl',             _.bind(me.onDownloadUrl, me));
+                                    var shapes = me.api.asc_getPropertyEditorShapes();
+                                    if (shapes)
+                                        me.fillAutoShapes(shapes[0], shapes[1]);
+
                                     me.fillTextArt(me.api.asc_getTextArtPreviews());
                                     me.updateThemeColors();
 
@@ -622,7 +625,10 @@ define([
                             rightmenuController.createDelayedElements();
 
                             if (!me.appOptions.isEditMailMerge && !me.appOptions.isEditDiagram) {
-                                me.api.asc_registerCallback('asc_onInitEditorShapes', _.bind(me.fillAutoShapes, me));
+                                var shapes = me.api.asc_getPropertyEditorShapes();
+                                if (shapes)
+                                    me.fillAutoShapes(shapes[0], shapes[1]);
+
                                 me.fillTextArt(me.api.asc_getTextArtPreviews());
                                 me.updateThemeColors();
                             }