Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1797 from ONLYOFFICE/fix/jszip

Browse source 
Remove jszip, jszip-utils
This commit is contained in:
Julia Radzhabova 2022-06-14 19:06:18 +03:00 committed by GitHub
parent b188798121 b176e9a862
commit 83e174c0e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 10 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/forms/app.js
View file

@ -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: {

4
apps/documenteditor/forms/app_dev.js
View file

@ -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) {

6
apps/documenteditor/main/app.js
View file

@ -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: {

4
apps/documenteditor/main/app_dev.js
View file

@ -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) {

4
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -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) => {

6
apps/presentationeditor/main/app.js
View file

@ -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: {

4
apps/presentationeditor/main/app_dev.js
View file

@ -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'

2
apps/spreadsheeteditor/embed/index.html
View file

@ -255,8 +255,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>

2
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -247,8 +247,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
require.config({

2
apps/spreadsheeteditor/embed/index_loader.html
View file

@ -329,8 +329,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script type="text/javascript" src="../../../../sdkjs/develop/sdkjs/cell/scripts.js"></script>
<script>

2
apps/spreadsheeteditor/embed/index_loader.html.deploy
View file

@ -321,8 +321,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<!--sdk-->
<link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>

6
apps/spreadsheeteditor/main/app.js
View file

@ -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: {

4
apps/spreadsheeteditor/main/app_dev.js
View file

@ -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) {

4
apps/spreadsheeteditor/mobile/src/controller/Main.jsx
View file

@ -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) => {

4
build/Gruntfile.js
View file

@ -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']);

6
build/appforms.json
View file

@ -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": {

24
build/common.json
View file

@ -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"
]

6
build/documenteditor.json
View file

@ -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": {

6
build/presentationeditor.json
View file

@ -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": {

6
build/spreadsheeteditor.json
View file

@ -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": {

3
test/spreadsheeteditor/main/index.html
View file

@ -116,9 +116,6 @@
<script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
<script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
<script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
<script src="../../../vendor/requirejs/require.js"></script>
<script>
require.config({