asc_onInitEditorShapes and get_PropertyEditorShapes -> asc_getPropertyEditorShapes

cell/api.js

@@ -1524,7 +1524,6 @@ var editor;
     this.asc_ApplyColorScheme(false);
 
     this.sendStandartTextures();
-    this.handlers.trigger("asc_onInitEditorShapes", AscCommon.g_oAutoShapesGroups, AscCommon.g_oAutoShapesTypes);
 
     // Применяем пришедшие при открытии изменения
     this._applyFirstLoadChanges();
@@ -3424,6 +3423,7 @@ var editor;
   prot["asc_setSelectedDrawingObjectLayer"] = prot.asc_setSelectedDrawingObjectLayer;
   prot["asc_getChartPreviews"] = prot.asc_getChartPreviews;
   prot["asc_getTextArtPreviews"] = prot.asc_getTextArtPreviews;
+  prot['asc_getPropertyEditorShapes'] = prot.asc_getPropertyEditorShapes;
   prot['asc_getPropertyEditorTextArts'] = prot.asc_getPropertyEditorTextArts;
   prot["asc_checkDataRange"] = prot.asc_checkDataRange;
   prot["asc_getBinaryFileWriter"] = prot.asc_getBinaryFileWriter;

common/Shapes/Serialize.js

@@ -656,9 +656,6 @@ function BinaryPPTYLoader()
 
             //var _editor = this.Api;
             //_editor.sync_InitEditorThemes(_editor.ThemeLoader.Themes.EditorThemes, _editor.ThemeLoader.Themes.DocumentThemes);
-
-            // шейпы посылаются только на подписке
-            //_editor.asc_fireCallback("asc_onInitEditorShapes", g_oAutoShapesGroups, g_oAutoShapesTypes);
         }
         else if (this.Api != null && this.IsThemeLoader)
         {

common/apiBase.js

@@ -549,6 +549,9 @@ baseEditorsApi.prototype.asc_onCloseChartFrame = function() {
 baseEditorsApi.prototype.asc_setInterfaceDrawImagePlaceShape = function(elementId) {
   this.shapeElementId = elementId;
 };
+baseEditorsApi.prototype.asc_getPropertyEditorShapes = function() {
+  return [AscCommon.g_oAutoShapesGroups, AscCommon.g_oAutoShapesTypes];
+};
 baseEditorsApi.prototype.asc_getPropertyEditorTextArts = function() {
   return [AscCommon.g_oPresetTxWarpGroups, AscCommon.g_PresetTxWarpTypes];
 };

slide/api.js

@@ -801,11 +801,6 @@ asc_docs_api.prototype.get_TextProps = function()
 
 // -------
 // тут методы, замены евентов
-asc_docs_api.prototype.get_PropertyEditorShapes = function()
-{
-    var ret = [AscCommon.g_oAutoShapesGroups, AscCommon.g_oAutoShapesTypes];
-    return ret;
-};
 asc_docs_api.prototype.get_PropertyStandartTextures = function()
 {
     var _count = AscCommon.g_oUserTexturePresets.length;
@@ -5096,7 +5091,7 @@ asc_docs_api.prototype['asc_unregisterCallback'] = asc_docs_api.prototype.asc_un
 asc_docs_api.prototype['asc_fireCallback'] = asc_docs_api.prototype.asc_fireCallback;
 asc_docs_api.prototype['asc_checkNeedCallback'] = asc_docs_api.prototype.asc_checkNeedCallback;
 asc_docs_api.prototype['get_TextProps'] = asc_docs_api.prototype.get_TextProps;
-asc_docs_api.prototype['get_PropertyEditorShapes'] = asc_docs_api.prototype.get_PropertyEditorShapes;
+asc_docs_api.prototype['asc_getPropertyEditorShapes'] = asc_docs_api.prototype.asc_getPropertyEditorShapes;
 asc_docs_api.prototype['asc_getPropertyEditorTextArts'] = asc_docs_api.prototype.asc_getPropertyEditorTextArts;
 asc_docs_api.prototype['get_PropertyStandartTextures'] = asc_docs_api.prototype.get_PropertyStandartTextures;
 asc_docs_api.prototype['get_PropertyEditorThemes'] = asc_docs_api.prototype.get_PropertyEditorThemes;

word/api.js

@@ -746,11 +746,6 @@ asc_docs_api.prototype.asc_checkNeedCallback = function(name) {
 };
 
 // тут методы, замены евентов
-asc_docs_api.prototype.get_PropertyEditorShapes = function()
-{
-    var ret = [AscCommon.g_oAutoShapesGroups, AscCommon.g_oAutoShapesTypes];
-    return ret;
-};
 asc_docs_api.prototype.get_PropertyThemeColors = function()
 {
     var _ret = [this._gui_control_colors.Colors, this._gui_control_colors.StandartColors];
@@ -1022,7 +1017,7 @@ asc_docs_api.prototype._coSpellCheckInit = function() {
         }
       }
     }
-  }
+  };
 
 asc_docs_api.prototype.asc_getSpellCheckLanguages = function() {
 	return AscCommon.g_spellCheckLanguages;
@@ -7317,7 +7312,7 @@ asc_docs_api.prototype['asc_registerCallback'] = asc_docs_api.prototype.asc_regi
 asc_docs_api.prototype['asc_unregisterCallback'] = asc_docs_api.prototype.asc_unregisterCallback;
 asc_docs_api.prototype['asc_fireCallback'] = asc_docs_api.prototype.asc_fireCallback;
 asc_docs_api.prototype['asc_checkNeedCallback'] = asc_docs_api.prototype.asc_checkNeedCallback;
-asc_docs_api.prototype['get_PropertyEditorShapes'] = asc_docs_api.prototype.get_PropertyEditorShapes;
+asc_docs_api.prototype['asc_getPropertyEditorShapes'] = asc_docs_api.prototype.asc_getPropertyEditorShapes;
 asc_docs_api.prototype['asc_getPropertyEditorTextArts'] = asc_docs_api.prototype.asc_getPropertyEditorTextArts;
 asc_docs_api.prototype['get_PropertyThemeColors'] = asc_docs_api.prototype.get_PropertyThemeColors;
 asc_docs_api.prototype['get_PropertyThemeColorSchemes'] = asc_docs_api.prototype.get_PropertyThemeColorSchemes;