Commit e31de797 authored by Alexey Golubev's avatar Alexey Golubev

Merge branch 'hotfix/v4.2.2'

parents 0b595593 d727e4ed
...@@ -2737,20 +2737,20 @@ CUserCacheColor.prototype.init = function(nColor) { ...@@ -2737,20 +2737,20 @@ CUserCacheColor.prototype.init = function(nColor) {
return; return;
} }
if (window["AscDesktopEditor"]) if (window["AscDesktopEditor"] && window["local_load_add"])
{ {
var _context = { "completeLoad" : function() { return callback(); } };
window["local_load_add"](_context, "sdk-all-from-min", url);
var _ret_param = window["AscDesktopEditor"]["LoadJS"](url); var _ret_param = window["AscDesktopEditor"]["LoadJS"](url);
if (2 != _ret_param)
window["local_load_remove"](url);
if (_ret_param == 1) if (_ret_param == 1)
{ {
setTimeout(callback, 1); setTimeout(callback, 1);
return; return;
} }
else if (_ret_param == 2) else if (_ret_param == 2)
{
window["asc_desktop_localModuleId"] = "sdk-all.js";
window["asc_desktop_context"] = { "completeLoad" : function() { return callback(); } };
return; return;
}
} }
var script = document.createElement('script'); var script = document.createElement('script');
......
...@@ -270,4 +270,5 @@ Asc['asc_docs_api'].prototype.asc_setAdvancedOptions = function(idOption, option ...@@ -270,4 +270,5 @@ Asc['asc_docs_api'].prototype.asc_setAdvancedOptions = function(idOption, option
_param += ("<m_sPassword>" + AscCommon.CopyPasteCorrectString(option.asc_getPassword()) + "</m_sPassword>"); _param += ("<m_sPassword>" + AscCommon.CopyPasteCorrectString(option.asc_getPassword()) + "</m_sPassword>");
window["AscDesktopEditor"]["SetAdvancedOptions"](_param); window["AscDesktopEditor"]["SetAdvancedOptions"](_param);
} }
}; };
\ No newline at end of file Asc['asc_docs_api'].prototype["asc_setAdvancedOptions"] = Asc['asc_docs_api'].prototype.asc_setAdvancedOptions;
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment