[Mobile][Embedded] Запуск редакторов с учетом новой структуры сдк.

apps/api/documents/cache-scripts.html

@@ -12,12 +12,12 @@
     <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
     <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-	<script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-    <script type="text/javascript" src="../../../sdk/Word/sdk-all.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+    <script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
     <div id="editor_sdk">
     <script type="text/javascript">
         var editor = new asc_docs_api("editor_sdk");
-        editor.asc_SetFontsPath("../../../sdk/Fonts/");
+        editor.asc_SetFontsPath("../../../../sdkjs/fonts/");
         editor.LoadFontsFromServer();
     </script>
 </body>

apps/documenteditor/embed/index.html.deploy

@@ -292,8 +292,8 @@
       <script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
 
       <!--sdk-->
-      <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-      <script type="text/javascript" src="../../../sdk/Word/sdk-all.js"></script>
+      <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+      <script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
 
       <!--application-->
       <link href="../../../apps/documenteditor/embed/resources/css/app-all.css" rel="stylesheet">

apps/documenteditor/embed/js/ApplicationController.js

@@ -676,7 +676,7 @@ var ApplicationController = new(function(){
 
         if (api){
             api.CreateComponents();
-            api.asc_SetFontsPath("../../../sdk/Fonts/");
+            api.asc_SetFontsPath("../../../../sdkjs/fonts/");
             api.Init();
 
             api.asc_registerCallback('asc_onError',                 onError);

apps/documenteditor/main/app_dev.js

@@ -72,18 +72,6 @@ require.config({
                 'irregularstack'
             ]
         },
-        sdk: {
-            deps: [
-                'jquery',
-                'underscore',
-                'allfonts',
-                'xregexp',
-                'sockjs',
-                'jszip',
-                'jsziputils',
-                'jsrsasign'
-            ]
-        },
         gateway: {
             deps: [
                 'jquery'

apps/documenteditor/main/index.html

@@ -239,7 +239,6 @@
 	<!-- sdk -->
     <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
 
-    <!-- -->
 	<script type="text/javascript" src="../../../../sdkjs/common/browser.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/editorscommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/downloaderfiles.js"></script>
@@ -262,7 +261,6 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Constants.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Format.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_engine.js"></script>
-	
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontFile.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/FontManager.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/font_map.js"></script>
@@ -279,7 +277,6 @@
     <script type="text/javascript" src="../../../../sdkjs/common/Charts/DrawingObjects.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/NumFormat.js"></script>
 
-
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/AdjustmentTracks.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/MoveTracks.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/NewShapeTracks.js"></script>
@@ -296,7 +293,6 @@
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Joined.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Math.js"></script>
 
-
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Shape.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/Image.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/GroupShape.js"></script>
@@ -310,7 +306,6 @@
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/Format/TextBody.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
 
-
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ShapePrototype.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/ImagePrototype.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/Format/GroupPrototype.js"></script>
@@ -322,7 +317,6 @@
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
     <!--Drawings -->
 
-    <!-- -->
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Metafile.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>

apps/documenteditor/mobile/app/controller/Main.js

@@ -29,7 +29,7 @@ Ext.define('DE.controller.Main', {
         api = new asc_docs_api("id-sdkeditor");
         api.SetMobileVersion(true);
         api.CreateComponents();
-        api.asc_SetFontsPath("../../../sdk/Fonts/");
+        api.asc_SetFontsPath("../../../../sdkjs/fonts/");
         api.Init();
         api.initEvents2MobileAdvances();
 

apps/documenteditor/mobile/index.html.deploy

@@ -220,8 +220,8 @@
         
         <!-- SDK -->
 
-        <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-        <script type="text/javascript" src="../../../sdk/Word/sdk-all.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/word/sdk-all.js"></script>
     </head>
     <body>
         <script type="text/javascript">

apps/presentationeditor/embed/index.html.deploy

@@ -292,8 +292,8 @@
       <script type="text/javascript" src="../../../vendor/jsrsasign/jsrsasign-latest-all-min.js"></script>
 
       <!--sdk-->
-      <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-      <script type="text/javascript" src="../../../sdk/PowerPoint/sdk-all.js"></script>
+      <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+      <script type="text/javascript" src="../../../../sdkjs/slide/sdk-all.js"></script>
 
       <!--application-->
       <link href="../../../apps/presentationeditor/embed/resources/css/app-all.css" rel="stylesheet">

apps/presentationeditor/embed/js/ApplicationController.js

@@ -684,8 +684,8 @@ var ApplicationController = new(function(){
 
         if (api){
             api.CreateComponents();
-            api.asc_SetFontsPath("../../../sdk/Fonts/");
-            api.SetThemesPath("../../../sdk/PowerPoint/themes/");
+            api.asc_SetFontsPath("../../../../sdkjs/fonts/");
+            api.SetThemesPath("../../../../sdkjs/slide/themes/");
             api.Init();
 
             api.asc_registerCallback('asc_onError',                 onError);

apps/presentationeditor/main/app_dev.js

@@ -68,17 +68,6 @@ require.config({
                 'irregularstack'
             ]
         },
-        sdk: {
-            deps: [
-                'jquery',
-                'underscore',
-                'allfonts',
-                'xregexp',
-                'sockjs',
-                'jsziputils',
-                'jsrsasign'
-            ]
-        },
         gateway: {
             deps: [
                 'jquery'

apps/presentationeditor/mobile/app/controller/Main.js

@@ -31,8 +31,8 @@ Ext.define('PE.controller.Main', {
         api = new asc_docs_api("id-sdkeditor");
         api.SetMobileVersion(true);
         api.CreateComponents();
-        api.asc_SetFontsPath("../../../sdk/Fonts/");
-        api.SetThemesPath("../../../sdk/PowerPoint/themes/");
+        api.asc_SetFontsPath("../../../../sdkjs/fonts/");
+        api.SetThemesPath("../../../../sdkjs/slide/themes/");
         api.Init();
         api.initEvents2MobileAdvances();
 

apps/presentationeditor/mobile/index.html.deploy

@@ -209,8 +209,8 @@
 
         <!-- SDK -->
 
-        <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-        <script type="text/javascript" src="../../../sdk/PowerPoint/sdk-all.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/slide/sdk-all.js"></script>
     </head>
     <body>
         <script type="text/javascript">

apps/spreadsheeteditor/embed/index.html.deploy

@@ -295,9 +295,9 @@
 
 
       <!--sdk-->
-      <link rel="stylesheet" type="text/css" href="../../../sdk/Excel/css/main.css"/>
-      <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-      <script type="text/javascript" src="../../../sdk/Excel/sdk-all.js"></script>
+      <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
+      <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+      <script type="text/javascript" src="../../../../sdkjs/cell/sdk-all.js"></script>
 
       <!--application-->
       <link href="../../../apps/spreadsheeteditor/embed/resources/css/app-all.css" rel="stylesheet">

apps/spreadsheeteditor/embed/js/ApplicationController.js

@@ -659,7 +659,7 @@ var ApplicationController = new(function(){
         api = new Asc.spreadsheet_api("editor_sdk");
 
         if (api){
-            api.asc_SetFontsPath("../../../sdk/Fonts/");
+            api.asc_SetFontsPath("../../../../sdkjs/fonts/");
 
             api.asc_registerCallback('asc_onStartAction',           onLongActionBegin);
             api.asc_registerCallback('asc_onEndAction',             onLongActionEnd);

apps/spreadsheeteditor/main/app_dev.js

@@ -68,17 +68,6 @@ require.config({
                 'irregularstack'
             ]
         },
-        sdk: {
-            deps: [
-                'jquery',
-                'underscore',
-                'allfonts',
-                'xregexp',
-                'sockjs',
-                'jsziputils',
-                'jsrsasign'
-            ]
-        },
         gateway: {
             deps: [
                 'jquery'

apps/spreadsheeteditor/main/index.html

@@ -334,7 +334,7 @@
 	<script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ArcTo.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ColorArray.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/word/Editor/common.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
 
     <!--for shapes-->
     <script src="../../../../sdkjs/common/Drawings/Hit.js"></script>

apps/spreadsheeteditor/mobile/app/controller/Main.js

@@ -33,7 +33,7 @@ Ext.define('SSE.controller.Main', {
 
         // Initialize api
         this.api = new Asc.spreadsheet_api("id-sdkeditor", "", SSE.controller.ApiEvents, {}, {});
-        this.api.asc_SetFontsPath("../../../sdk/Fonts/");
+        this.api.asc_SetFontsPath("../../../../sdkjs/fonts/");
         this.api.asc_setMobileVersion(true);
 
         this.api.asc_registerCallback('asc_onAdvancedOptions',      Ext.bind(this.onAdvancedOptions, this));

apps/spreadsheeteditor/mobile/index.html.deploy

@@ -170,7 +170,7 @@
         </style>
 
         <!-- vendors -->
-        <link rel="stylesheet" type="text/css" href="../../../sdk/Excel/css/main-mobile.css"/>
+        <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main-mobile.css"/>
 
         <script type="text/javascript" src="../../../vendor/touch/sencha-touch-all.js"></script>
         <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
@@ -184,8 +184,8 @@
 
         <!-- SDK -->
 
-        <script type="text/javascript" src="../../../sdk/Common/AllFonts.js"></script>
-        <script type="text/javascript" src="../../../sdk/Excel/sdk-all.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
+        <script type="text/javascript" src="../../../../sdkjs/cell/sdk-all.js"></script>
 
         <!-- Application -->