diff --git a/apps/api/documents/cache-scripts.html b/apps/api/documents/cache-scripts.html index d9497e2d3..4aca07b9a 100644 --- a/apps/api/documents/cache-scripts.html +++ b/apps/api/documents/cache-scripts.html @@ -12,12 +12,12 @@ - - + +
diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index c04d04a3f..b4c8929af 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -302,8 +302,182 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index c977ddaa7..a0190ae71 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -292,8 +292,8 @@ - - + + diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 42a401bfa..b8c7e9f0b 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/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); diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index a6f24ca24..aca4b3a00 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/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' diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index 9fadae58c..1a9186993 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -239,7 +239,6 @@ - @@ -262,7 +261,6 @@ - @@ -279,7 +277,6 @@ - @@ -296,7 +293,6 @@ - @@ -310,7 +306,6 @@ - @@ -322,7 +317,6 @@ - diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 13aee3558..d94a1f905 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/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(); diff --git a/apps/documenteditor/mobile/index.html b/apps/documenteditor/mobile/index.html index 4a060ea75..e62ec2d8d 100644 --- a/apps/documenteditor/mobile/index.html +++ b/apps/documenteditor/mobile/index.html @@ -216,9 +216,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 6ba05fca9..6140969d0 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -292,8 +292,8 @@ - - + + diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index df51eca41..ad8007caf 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/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); diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index 9fa9a5861..88a5feb17 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/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' diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index 58b42736f..d76d6949a 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -229,205 +229,188 @@
- - - - - - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + - - - + + + + + - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + + - + + + + + - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index f5017cb36..32424cc35 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/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(); diff --git a/apps/presentationeditor/mobile/index.html b/apps/presentationeditor/mobile/index.html index 1d8cb3f2d..3c3b1edf0 100644 --- a/apps/presentationeditor/mobile/index.html +++ b/apps/presentationeditor/mobile/index.html @@ -215,9 +215,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index daf5f012b..4daeff8a9 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -295,9 +295,9 @@ - - - + + + diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index d204a8c56..52b582368 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/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); diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index d030e14a0..2d1ec8cf8 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/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' diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html index b2ae1ff47..e42692996 100644 --- a/apps/spreadsheeteditor/main/index.html +++ b/apps/spreadsheeteditor/main/index.html @@ -334,7 +334,7 @@ - + diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 6eb974e48..00d320de2 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/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)); diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html index eb9b9b04f..749c5064a 100644 --- a/apps/spreadsheeteditor/mobile/index.html +++ b/apps/spreadsheeteditor/mobile/index.html @@ -171,7 +171,7 @@ - + @@ -221,8 +221,192 @@ window.g_debug_mode = true; - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -184,8 +184,8 @@ - - + +