From ae8ecc76642218686fb6a2cc3b1d1be53714c886 Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" <Alexander.Trofimov@OnlyOffice.com> Date: Fri, 4 Dec 2015 08:13:42 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D1=88=D0=B5=D0=BB=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20=D1=84=D1=83?= =?UTF-8?q?=D0=BD=D0=BA=D1=86=D0=B8=D1=8E=20asc=5FaddImage.=20=D0=A1=D1=82?= =?UTF-8?q?=D0=B0=D1=80=D1=83=D1=8E=20=D0=BF=D0=BE=D0=BA=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E,=20=D0=BD=D0=B0=20=D0=B2=D1=81=D1=8F?= =?UTF-8?q?=D0=BA=D0=B8=D0=B9=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66431 954022d7-b5bf-4e40-9824-e11837661b57 --- Excel/api.js | 7 ++++--- PowerPoint/Local/api.js | 4 ++++ PowerPoint/api.js | 8 ++++---- PowerPoint/apiExport.js | 1 + PowerPoint/menu/main_menu2.js | 2 +- Word/Local/api.js | 4 ++++ Word/api.js | 4 ++-- Word/apiExport.js | 1 + 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Excel/api.js b/Excel/api.js index 61aa97d71..f51d53b52 100644 --- a/Excel/api.js +++ b/Excel/api.js @@ -2621,17 +2621,17 @@ var editor; spreadsheet_api.prototype.asc_changeImageFromFile = function() { this.isImageChangeUrl = true; - this.asc_showImageFileDialog(); + this.asc_addImage(); }; spreadsheet_api.prototype.asc_changeShapeImageFromFile = function() { this.isShapeImageChangeUrl = true; - this.asc_showImageFileDialog(); + this.asc_addImage(); }; spreadsheet_api.prototype.asc_changeArtImageFromFile = function() { this.isTextArtChangeUrl = true; - this.asc_showImageFileDialog(); + this.asc_addImage(); }; spreadsheet_api.prototype.asc_putPrLineSpacing = function(type, value) { @@ -3483,6 +3483,7 @@ var editor; prot["asc_getWordChartObject"] = prot.asc_getWordChartObject; prot["asc_cleanWorksheet"] = prot.asc_cleanWorksheet; prot["asc_showImageFileDialog"] = prot.asc_showImageFileDialog; + prot["asc_addImage"] = prot.asc_addImage; prot["asc_setData"] = prot.asc_setData; prot["asc_getData"] = prot.asc_getData; diff --git a/PowerPoint/Local/api.js b/PowerPoint/Local/api.js index dbc3bbfb1..ae9cc698a 100644 --- a/PowerPoint/Local/api.js +++ b/PowerPoint/Local/api.js @@ -122,6 +122,10 @@ asc_docs_api.prototype.AddImage = function() { window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"](); }; +asc_docs_api.prototype.asc_addImage = function() +{ + window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"](); +}; asc_docs_api.prototype.asc_isOffline = function() { return true; diff --git a/PowerPoint/api.js b/PowerPoint/api.js index 59aa213cd..d1fdb8d7b 100644 --- a/PowerPoint/api.js +++ b/PowerPoint/api.js @@ -2847,22 +2847,22 @@ asc_docs_api.prototype.sync_TblAlignChangedCallback = function(style){ asc_docs_api.prototype.ChangeImageFromFile = function() { this.isImageChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.ChangeShapeImageFromFile = function() { this.isShapeImageChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.ChangeSlideImageFromFile = function() { this.isSlideImageChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.ChangeArtImageFromFile = function() { this.isTextArtChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.AddImage = function(){ diff --git a/PowerPoint/apiExport.js b/PowerPoint/apiExport.js index dbe4007e6..17dafc6d3 100644 --- a/PowerPoint/apiExport.js +++ b/PowerPoint/apiExport.js @@ -230,6 +230,7 @@ asc_docs_api.prototype['ChangeShapeImageFromFile'] = asc_docs_api.prototype.Chan asc_docs_api.prototype['ChangeSlideImageFromFile'] = asc_docs_api.prototype.ChangeSlideImageFromFile; asc_docs_api.prototype['ChangeArtImageFromFile'] = asc_docs_api.prototype.ChangeArtImageFromFile; asc_docs_api.prototype['AddImage'] = asc_docs_api.prototype.AddImage; +asc_docs_api.prototype['asc_addImage'] = asc_docs_api.prototype.asc_addImage; asc_docs_api.prototype['StartAddShape'] = asc_docs_api.prototype.StartAddShape; asc_docs_api.prototype['AddTextArt'] = asc_docs_api.prototype.AddTextArt; asc_docs_api.prototype['canGroup'] = asc_docs_api.prototype.canGroup; diff --git a/PowerPoint/menu/main_menu2.js b/PowerPoint/menu/main_menu2.js index 904dc68e5..52dd2e63b 100644 --- a/PowerPoint/menu/main_menu2.js +++ b/PowerPoint/menu/main_menu2.js @@ -815,7 +815,7 @@ $("#td_orient, #td_redo, #td_undo, #td_bold, #td_italic, #td_underline, #td_prin //_img.innerHtml = "./Images/Test.jpg"; _img.src = "./Images/Test.jpg"; */ - editor.AddImage(true); + editor.asc_addImage(true); break; case "td_imageInText2": editor.AddImageUrl("./Images/Test.jpg"); diff --git a/Word/Local/api.js b/Word/Local/api.js index d2c228b08..66098aefa 100644 --- a/Word/Local/api.js +++ b/Word/Local/api.js @@ -128,6 +128,10 @@ asc_docs_api.prototype.AddImage = function() { window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"](); }; +asc_docs_api.prototype.asc_addImage = function() +{ + window["AscDesktopEditor"]["LocalFileGetImageUrlFromOpenFileDialog"](); +}; asc_docs_api.prototype.asc_isOffline = function() { return true; diff --git a/Word/api.js b/Word/api.js index 61a6fe4f2..e72e5277c 100644 --- a/Word/api.js +++ b/Word/api.js @@ -4340,12 +4340,12 @@ asc_docs_api.prototype.sync_TblAlignChangedCallback = function(style){ asc_docs_api.prototype.ChangeImageFromFile = function() { this.isImageChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.ChangeShapeImageFromFile = function() { this.isShapeImageChangeUrl = true; - this.AddImage(); + this.asc_addImage(); }; asc_docs_api.prototype.AddImage = function(){ diff --git a/Word/apiExport.js b/Word/apiExport.js index cfb717507..e59d1b935 100644 --- a/Word/apiExport.js +++ b/Word/apiExport.js @@ -341,6 +341,7 @@ asc_docs_api.prototype['sync_TblAlignChangedCallback'] = asc_docs_api.prototype. asc_docs_api.prototype['ChangeImageFromFile'] = asc_docs_api.prototype.ChangeImageFromFile; asc_docs_api.prototype['ChangeShapeImageFromFile'] = asc_docs_api.prototype.ChangeShapeImageFromFile; asc_docs_api.prototype['AddImage'] = asc_docs_api.prototype.AddImage; +asc_docs_api.prototype['asc_addImage'] = asc_docs_api.prototype.asc_addImage; asc_docs_api.prototype['AddImageUrl2'] = asc_docs_api.prototype.AddImageUrl2; asc_docs_api.prototype['AddImageUrl'] = asc_docs_api.prototype.AddImageUrl; asc_docs_api.prototype['AddImageUrlAction'] = asc_docs_api.prototype.AddImageUrlAction; -- 2.30.9