diff --git a/cell/api.js b/cell/api.js index 18c4ce22570963dd5e9ef9d3b7073f62012e7027..4b2742cac30ccde7093ca0cd3a2cad96ed88cf5d 100644 --- a/cell/api.js +++ b/cell/api.js @@ -1548,7 +1548,6 @@ var editor; this.asc_ApplyColorScheme(false); this.sendStandartTextures(); - this.handlers.trigger("asc_onInitEditorShapes", AscCommon.g_oAutoShapesGroups, AscCommon.g_oAutoShapesTypes); // ПрименÑем пришедшие при открытии Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ this._applyFirstLoadChanges(); @@ -3448,6 +3447,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; diff --git a/common/Shapes/Serialize.js b/common/Shapes/Serialize.js index 972a579bec7a5e94cea86380e3eee35c4ba59941..63b1b8e180a38379ba572c7a3ee676af3a903ffe 100644 --- a/common/Shapes/Serialize.js +++ b/common/Shapes/Serialize.js @@ -680,9 +680,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) { diff --git a/common/apiBase.js b/common/apiBase.js index c41dfefcf40d4201e7bc799ad3a3b95a4cd54cda..423c381ffd7b89091af399ba237130baf9c768d0 100644 --- a/common/apiBase.js +++ b/common/apiBase.js @@ -573,6 +573,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]; }; diff --git a/slide/api.js b/slide/api.js index 6f9fd00cc9367a1071d1b8bdc49b03a0faa064fe..32e9a204b6581d19823ff8cff48378c0d04450f3 100644 --- a/slide/api.js +++ b/slide/api.js @@ -825,11 +825,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; @@ -5120,7 +5115,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; diff --git a/word/api.js b/word/api.js index b51eecbe3c989e3af247e0f7a887e87139b539a9..7f82d482ad75d9ae4e0002c30a067370baa2bb25 100644 --- a/word/api.js +++ b/word/api.js @@ -770,11 +770,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]; @@ -1046,7 +1041,7 @@ asc_docs_api.prototype._coSpellCheckInit = function() { } } } - } + }; asc_docs_api.prototype.asc_getSpellCheckLanguages = function() { return AscCommon.g_spellCheckLanguages; @@ -7341,7 +7336,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;