Commit 6bd22923 authored by Oleg Korshul's avatar Oleg Korshul Committed by Alexander.Trofimov

десктоп в новой схеме. потом подумаю как сделать по-хорошему

parent f0ba3f97
...@@ -6,16 +6,31 @@ call grunt --level=ADVANCED --desktop=true ...@@ -6,16 +6,31 @@ call grunt --level=ADVANCED --desktop=true
copy ..\word\sdk-all.js ..\..\core\build\jsdesktop\word\sdk-all.js 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 ..\slide\sdk-all.js ..\..\core\build\jsdesktop\slide\sdk-all.js
copy ..\cell\sdk-all.js ..\..\core\build\jsdesktop\cell\sdk-all.js copy ..\cell\sdk-all.js ..\..\core\build\jsdesktop\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 ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js copy ..\common\Native\native.js ..\..\core\build\jsdesktop\common\Native\native.js
copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all.js
copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all.js
copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all.js copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all.js
copy ..\word\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\word\sdk-all-min.js
copy ..\slide\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\slide\sdk-all-min.js
copy ..\cell\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\cell\sdk-all-min.js
copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\common\Native\native.js copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Debug\Local\editors\sdkjs\common\Native\native.js
copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all.js copy ..\word\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all.js
copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all.js copy ..\slide\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all.js
copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all.js copy ..\cell\sdk-all.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all.js
copy ..\word\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\word\sdk-all-min.js
copy ..\slide\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\slide\sdk-all-min.js
copy ..\cell\sdk-all-min.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\cell\sdk-all-min.js
copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\common\Native\native.js copy ..\common\Native\native.js ..\..\core\DesktopEditor\ChromiumBasedEditors2\app\test\src\build\win_64\Release\Local\editors\sdkjs\common\Native\native.js
pause pause
\ No newline at end of file
...@@ -2641,6 +2641,22 @@ CUserCacheColor.prototype.init = function(nColor) { ...@@ -2641,6 +2641,22 @@ CUserCacheColor.prototype.init = function(nColor) {
}; };
function loadScript(url, callback) { function loadScript(url, callback) {
if (window["AscDesktopEditor"])
{
var _ret_param = window["AscDesktopEditor"]["LoadJS"](url);
if (_ret_param == 1)
{
setTimeout(callback, 1);
return;
}
else if (_ret_param == 2)
{
window["asc_desktop_localModuleId"] = "sdk-all.js";
window["asc_desktop_context"] = { "completeLoad" : function() { return callback(); } };
return;
}
}
var script = document.createElement('script'); var script = document.createElement('script');
script.type = 'text/javascript'; script.type = 'text/javascript';
script.src = url; script.src = url;
......
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