diff --git a/apps/documenteditor/forms/app.js b/apps/documenteditor/forms/app.js index 273f140f5..9ec2b7522 100644 --- a/apps/documenteditor/forms/app.js +++ b/apps/documenteditor/forms/app.js @@ -47,8 +47,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', @@ -102,9 +100,7 @@ require.config({ 'underscore', 'allfonts', 'xregexp', - 'sockjs', - 'jszip', - 'jsziputils' + 'sockjs' ] }, gateway: { diff --git a/apps/documenteditor/forms/app_dev.js b/apps/documenteditor/forms/app_dev.js index 93a96c2d5..d0ff647a7 100644 --- a/apps/documenteditor/forms/app_dev.js +++ b/apps/documenteditor/forms/app_dev.js @@ -47,8 +47,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -115,8 +113,6 @@ require([ 'analytics', 'gateway', 'locale', - 'jszip', - 'jsziputils', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index e6a4ded43..ee567e211 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', @@ -109,9 +107,7 @@ require.config({ 'underscore', 'allfonts', 'xregexp', - 'sockjs', - 'jszip', - 'jsziputils' + 'sockjs' ] }, gateway: { diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index ebb623df1..990fa4823 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -122,8 +120,6 @@ require([ 'analytics', 'gateway', 'locale', - 'jszip', - 'jsziputils', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { diff --git a/apps/documenteditor/mobile/src/controller/Main.jsx b/apps/documenteditor/mobile/src/controller/Main.jsx index d7408414a..8380ac185 100644 --- a/apps/documenteditor/mobile/src/controller/Main.jsx +++ b/apps/documenteditor/mobile/src/controller/Main.jsx @@ -60,9 +60,7 @@ class MainController extends Component { !window.sdk_scripts && (window.sdk_scripts = ['../../../../sdkjs/common/AllFonts.js', '../../../../sdkjs/word/sdk-all-min.js']); let dep_scripts = ['../../../vendor/xregexp/xregexp-all-min.js', - '../../../vendor/sockjs/sockjs.min.js', - '../../../vendor/jszip/jszip.min.js', - '../../../vendor/jszip-utils/jszip-utils.min.js']; + '../../../vendor/sockjs/sockjs.min.js']; dep_scripts.push(...window.sdk_scripts); const promise_get_script = (scriptpath) => { diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index e18ce4ee0..089bd6906 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/slide/sdk-all-min', api : 'api/documents/api', @@ -108,9 +106,7 @@ require.config({ 'underscore', 'allfonts', 'xregexp', - 'sockjs', - 'jszip', - 'jsziputils' + 'sockjs' ] }, gateway: { diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index cf8684101..2cf067eaa 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -121,8 +119,6 @@ require([ 'analytics', 'gateway', 'locale', - 'jszip', - 'jsziputils', 'sockjs', 'xregexp', 'underscore' diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 99174196f..01aae5619 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -255,8 +255,6 @@ - - - - - - - - diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index 8fea0368f..42fff9d89 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/cell/sdk-all-min', api : 'api/documents/api', @@ -108,9 +106,7 @@ require.config({ 'underscore', 'allfonts', 'xregexp', - 'sockjs', - 'jszip', - 'jsziputils' + 'sockjs' ] }, gateway: { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index d634c7aa0..af9d5b6f7 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -54,8 +54,6 @@ require.config({ jmousewheel : '../vendor/perfect-scrollbar/src/jquery.mousewheel', xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', - jszip : '../vendor/jszip/jszip.min', - jsziputils : '../vendor/jszip-utils/jszip-utils.min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -121,8 +119,6 @@ require([ 'analytics', 'gateway', 'locale', - 'jszip', - 'jsziputils', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx index de031d0e1..de2cd357d 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx @@ -71,9 +71,7 @@ class MainController extends Component { '../../../vendor/bootstrap/dist/js/bootstrap.min.js', '../../../vendor/underscore/underscore-min.js', '../../../vendor/xregexp/xregexp-all-min.js', - '../../../vendor/sockjs/sockjs.min.js', - '../../../vendor/jszip/jszip.min.js', - '../../../vendor/jszip-utils/jszip-utils.min.js']; + '../../../vendor/sockjs/sockjs.min.js']; dep_scripts.push(...window.sdk_scripts); const promise_get_script = (scriptpath) => { diff --git a/build/Gruntfile.js b/build/Gruntfile.js index db261ec31..246d2d13d 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -282,8 +282,6 @@ module.exports = function(grunt) { doRegisterTask('iscroll'); doRegisterTask('fetch'); doRegisterTask('es6-promise'); - doRegisterTask('jszip'); - doRegisterTask('jsziputils'); doRegisterTask('common-embed'); doRegisterTask('requirejs', function(defaultConfig, packageFile) { return { @@ -674,8 +672,6 @@ module.exports = function(grunt) { grunt.registerTask('deploy-iscroll', ['iscroll-init', 'clean', 'copy']); grunt.registerTask('deploy-fetch', ['fetch-init', 'clean', 'copy']); grunt.registerTask('deploy-bootstrap', ['bootstrap-init', 'clean', 'copy']); - grunt.registerTask('deploy-jszip', ['jszip-init', 'clean', 'copy']); - grunt.registerTask('deploy-jsziputils', ['jsziputils-init', 'clean', 'copy']); grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'terser']); grunt.registerTask('deploy-es6-promise', ['es6-promise-init', 'clean', 'copy']); grunt.registerTask('deploy-common-embed', ['common-embed-init', 'clean', 'copy']); diff --git a/build/appforms.json b/build/appforms.json index 12b4e77c2..7a2f2ed9c 100644 --- a/build/appforms.json +++ b/build/appforms.json @@ -33,8 +33,6 @@ "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -87,9 +85,7 @@ "coapisettings", "allfonts", "xregexp", - "sockjs", - "jszip", - "jszip-utils" + "sockjs" ] }, "gateway": { diff --git a/build/common.json b/build/common.json index 2dd34ff01..ce6987efa 100644 --- a/build/common.json +++ b/build/common.json @@ -202,28 +202,6 @@ } } }, - "jszip": { - "clean": [ - "../deploy/web-apps/vendor/jszip" - ], - "copy": { - "script": { - "src": "../vendor/jszip/jszip.min.js", - "dest": "../deploy/web-apps/vendor/jszip/jszip.min.js" - } - } - }, - "jsziputils": { - "clean": [ - "../deploy/web-apps/vendor/jszip-utils" - ], - "copy": { - "script": { - "src": "../vendor/jszip-utils/jszip-utils.min.js", - "dest": "../deploy/web-apps/vendor/jszip-utils/jszip-utils.min.js" - } - } - }, "underscore": { "clean": [ "../deploy/web-apps/vendor/underscore" @@ -303,8 +281,6 @@ "deploy-bootstrap", "deploy-iscroll", "deploy-fetch", - "deploy-jszip", - "deploy-jsziputils", "deploy-es6-promise", "deploy-common-embed" ] diff --git a/build/documenteditor.json b/build/documenteditor.json index 47cfe95a9..249a38666 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -31,8 +31,6 @@ "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,9 +83,7 @@ "coapisettings", "allfonts", "xregexp", - "sockjs", - "jszip", - "jszip-utils" + "sockjs" ] }, "gateway": { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index 5531492f2..209a62b4d 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -31,8 +31,6 @@ "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,9 +83,7 @@ "coapisettings", "allfonts", "xregexp", - "sockjs", - "jszip", - "jszip-utils" + "sockjs" ] }, "gateway": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 11c4e50a7..267dc61ad 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -31,8 +31,6 @@ "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel", "xregexp": "empty:", "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,9 +83,7 @@ "coapisettings", "allfonts", "xregexp", - "sockjs", - "jszip", - "jszip-utils" + "sockjs" ] }, "gateway": { diff --git a/test/spreadsheeteditor/main/index.html b/test/spreadsheeteditor/main/index.html index f36a0cf78..9ee008707 100644 --- a/test/spreadsheeteditor/main/index.html +++ b/test/spreadsheeteditor/main/index.html @@ -116,9 +116,6 @@ - - -