Merge pull request #76 from ONLYOFFICE/hotfix/v4.1.5

Hotfix/v4.1.5

build/build-desktop.bat

@@ -3,15 +3,15 @@ call npm install -g grunt-cli
 call npm install
 rem call grunt --level=WHITESPACE_ONLY --desktop=true --formatting=PRETTY_PRINT
 call grunt --level=ADVANCED --desktop=true
-copy ..\word\sdk-all.js ..\..\core\build\jsdesktop\word\sdk-all.js
-copy ..\slide\sdk-all.js ..\..\core\build\jsdesktop\slide\sdk-all.js
-copy ..\cell\sdk-all.js ..\..\core\build\jsdesktop\cell\sdk-all.js
+copy ..\word\sdk-all.js ..\..\core\build\jsdesktop\sdkjs\word\sdk-all.js
+copy ..\slide\sdk-all.js ..\..\core\build\jsdesktop\sdkjs\slide\sdk-all.js
+copy ..\cell\sdk-all.js ..\..\core\build\jsdesktop\sdkjs\cell\sdk-all.js
 
-copy ..\word\sdk-all-min.js ..\..\core\build\jsdesktop\word\sdk-all-min.js
-copy ..\slide\sdk-all-min.js ..\..\core\build\jsdesktop\slide\sdk-all-min.js
-copy ..\cell\sdk-all-min.js ..\..\core\build\jsdesktop\cell\sdk-all-min.js
+copy ..\word\sdk-all-min.js ..\..\core\build\jsdesktop\sdkjs\word\sdk-all-min.js
+copy ..\slide\sdk-all-min.js ..\..\core\build\jsdesktop\sdkjs\slide\sdk-all-min.js
+copy ..\cell\sdk-all-min.js ..\..\core\build\jsdesktop\sdkjs\cell\sdk-all-min.js
 
-copy ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js
+copy ..\common\Native\native.js ..\..\core\build\jsdesktop\sdkjs\common\Native\native.js
 
 copy ..\word\sdk-all.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js
 copy ..\slide\sdk-all.js ..\..\core-ext\desktop-sdk-wrapper\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js

cell/Local/api.js

@@ -53,6 +53,8 @@ var c_oAscError = Asc.c_oAscError;
 	{
 		this.asc_registerCallback('asc_onDocumentContentReady', function(){
 			DesktopOfflineUpdateLocalName(window["Asc"]["editor"]);
+
+			setTimeout(function(){window["UpdateInstallPlugins"]();}, 10);
 		});
 	
 		window["AscDesktopEditor"]["LocalStartOpen"]();

common/apiBase.js

@@ -783,8 +783,11 @@
 
 	baseEditorsApi.prototype.asc_loadLocalImageAndAction = function(sLocalImage, fCallback)
 	{
-		this.ImageLoader.LoadImage(AscCommon.getFullImageSrc2(sLocalImage), 1);
-		this.asc_replaceLoadImageCallback(fCallback);
+		var _loadedUrl = this.ImageLoader.LoadImage(AscCommon.getFullImageSrc2(sLocalImage), 1);
+		if (_loadedUrl != null)
+		    fCallback();
+        else
+        	this.asc_replaceLoadImageCallback(fCallback);
 	};
 
 	baseEditorsApi.prototype.asc_checkImageUrlAndAction = function(sImageUrl, fCallback)
@@ -814,6 +817,9 @@
 
 	baseEditorsApi.prototype.asc_addOleObject = function(oPluginData)
 	{
+		if(this.isViewMode){
+			return;
+		}
 		Asc.CPluginData_wrap(oPluginData);
 		var oThis      = this;
 		var sImgSrc    = oPluginData.getAttribute("imgSrc");
@@ -837,6 +843,9 @@
 
 	baseEditorsApi.prototype.asc_editOleObject = function(oPluginData)
 	{
+		if(this.isViewMode){
+			return;
+		}
 		Asc.CPluginData_wrap(oPluginData);
 		var oThis      = this;
 		var bResize    = oPluginData.getAttribute("resize");

slide/Editor/Format/Presentation.js

@@ -5111,6 +5111,7 @@ CPresentation.prototype =
                     return true;
                 }
             }
+            this.Document_UpdateInterfaceState();
         }
     },
 

slide/Local/api.js

@@ -42,6 +42,8 @@ Asc['asc_docs_api'].prototype._OfflineAppDocumentStartLoad = function()
 {
 	this.asc_registerCallback('asc_onDocumentContentReady', function(){
 		DesktopOfflineUpdateLocalName(editor);
+
+		setTimeout(function(){window["UpdateInstallPlugins"]();}, 10);
 	});
 
 	AscCommon.History.UserSaveMode = true;

slide/api.js

@@ -3960,6 +3960,17 @@ background-repeat: no-repeat;\
 			else
 			{
 				this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
+
+				if (window["AscDesktopEditor"])
+                {
+                    var _url = window["AscDesktopEditor"]["LocalFileGetImageUrl"](sImageUrl);
+                    _url     = g_oDocumentUrls.getImageUrl(_url);
+                    ImagePr.ImageUrl = _url;
+                    fApplyCallback();
+                    this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.UploadImage);
+                    return;
+                }
+
 				this.fCurCallback = function(input)
 				{
 					if (null != input && "imgurl" == input["type"])