diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index 9bf9f202b..b5bbca2db 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -323,7 +323,6 @@ - - diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js index 5c2a4049d..3cb20c44f 100644 --- a/apps/documenteditor/main/app.js +++ b/apps/documenteditor/main/app.js @@ -56,7 +56,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', @@ -112,8 +111,7 @@ require.config({ 'xregexp', 'sockjs', 'jszip', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, gateway: { diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js index d15f17707..49d9e8fa0 100644 --- a/apps/documenteditor/main/app_dev.js +++ b/apps/documenteditor/main/app_dev.js @@ -56,7 +56,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -125,7 +124,6 @@ require([ 'locale', 'jszip', 'jsziputils', - 'jsrsasign', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js index 8f9d3a3be..43c8bce3c 100644 --- a/apps/documenteditor/mobile/app-dev.js +++ b/apps/documenteditor/mobile/app-dev.js @@ -53,7 +53,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', extendes : 'common/mobile/utils/extendes', @@ -120,7 +119,6 @@ require([ 'locale', 'jszip', 'jsziputils', - 'jsrsasign', 'sockjs' ], function (Backbone, Framework7, Core) { Backbone.history.start(); diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index ebf92413d..0c8542859 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -53,7 +53,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/word/sdk-all-min', api : 'api/documents/api', @@ -105,8 +104,7 @@ require.config({ 'xregexp', 'sockjs', 'jszip', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, gateway: { diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index aa4c5f04b..ceabd4062 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -325,7 +325,6 @@ - - diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js index 941fc47b2..8e30eb1c2 100644 --- a/apps/presentationeditor/main/app.js +++ b/apps/presentationeditor/main/app.js @@ -55,7 +55,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/slide/sdk-all-min', api : 'api/documents/api', @@ -109,8 +108,7 @@ require.config({ 'allfonts', 'xregexp', 'sockjs', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, gateway: { diff --git a/apps/presentationeditor/main/app_dev.js b/apps/presentationeditor/main/app_dev.js index 56aea9616..46dc5c451 100644 --- a/apps/presentationeditor/main/app_dev.js +++ b/apps/presentationeditor/main/app_dev.js @@ -55,7 +55,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -122,7 +121,6 @@ require([ 'gateway', 'locale', 'jsziputils', - 'jsrsasign', 'sockjs', 'xregexp', 'underscore' diff --git a/apps/presentationeditor/mobile/app-dev.js b/apps/presentationeditor/mobile/app-dev.js index 020c907f2..013a3cf16 100644 --- a/apps/presentationeditor/mobile/app-dev.js +++ b/apps/presentationeditor/mobile/app-dev.js @@ -54,7 +54,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', extendes : 'common/mobile/utils/extendes', @@ -121,7 +120,6 @@ require([ 'locale', 'jszip', 'jsziputils', - 'jsrsasign', 'sockjs' ], function (Backbone, Framework7, Core) { Backbone.history.start(); diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index c4606d588..4df2708c1 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -54,7 +54,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/slide/sdk-all-min', api : 'api/documents/api', @@ -106,8 +105,7 @@ require.config({ 'xregexp', 'sockjs', 'jszip', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, gateway: { diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 0695c7f3d..99a46ebed 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -324,7 +324,6 @@ - - diff --git a/apps/spreadsheeteditor/main/app.js b/apps/spreadsheeteditor/main/app.js index db740f9e6..c397378b5 100644 --- a/apps/spreadsheeteditor/main/app.js +++ b/apps/spreadsheeteditor/main/app.js @@ -55,7 +55,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/cell/sdk-all-min', api : 'api/documents/api', @@ -109,8 +108,7 @@ require.config({ 'allfonts', 'xregexp', 'sockjs', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, gateway: { diff --git a/apps/spreadsheeteditor/main/app_dev.js b/apps/spreadsheeteditor/main/app_dev.js index 3d8301bbb..2caaafbfe 100644 --- a/apps/spreadsheeteditor/main/app_dev.js +++ b/apps/spreadsheeteditor/main/app_dev.js @@ -55,7 +55,6 @@ require.config({ xregexp : '../vendor/xregexp/xregexp-all-min', sockjs : '../vendor/sockjs/sockjs.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', notification : 'common/main/lib/core/NotificationCenter', @@ -122,7 +121,6 @@ require([ 'gateway', 'locale', 'jsziputils', - 'jsrsasign', 'sockjs', 'underscore' ], function (Backbone, Bootstrap, Core) { diff --git a/apps/spreadsheeteditor/mobile/app-dev.js b/apps/spreadsheeteditor/mobile/app-dev.js index 70e500048..d3a031a77 100644 --- a/apps/spreadsheeteditor/mobile/app-dev.js +++ b/apps/spreadsheeteditor/mobile/app-dev.js @@ -53,7 +53,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', api : 'api/documents/api', core : 'common/main/lib/core/application', extendes : 'common/mobile/utils/extendes', @@ -102,7 +101,6 @@ require([ 'locale', 'jszip', 'jsziputils', - 'jsrsasign', 'sockjs' ], function (Backbone, Framework7) { Backbone.history.start(); diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js index 518035953..f87754175 100644 --- a/apps/spreadsheeteditor/mobile/app.js +++ b/apps/spreadsheeteditor/mobile/app.js @@ -53,7 +53,6 @@ require.config({ sockjs : '../vendor/sockjs/sockjs.min', jszip : '../vendor/jszip/jszip.min', jsziputils : '../vendor/jszip-utils/jszip-utils.min', - jsrsasign : '../vendor/jsrsasign/jsrsasign-latest-all-min', allfonts : '../../sdkjs/common/AllFonts', sdk : '../../sdkjs/cell/sdk-all-min', api : 'api/documents/api', @@ -82,8 +81,7 @@ require.config({ 'xregexp', 'sockjs', 'jszip', - 'jsziputils', - 'jsrsasign' + 'jsziputils' ] }, backbone: { diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 05a499ce5..e4021d4b2 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -114,7 +114,6 @@ module.exports = function(grunt) { doRegisterTask('bootstrap'); doRegisterTask('jszip'); doRegisterTask('jsziputils'); - doRegisterTask('jsrsasign'); doRegisterTask('requirejs', function(defaultConfig, packageFile) { return { uglify: { @@ -374,7 +373,6 @@ module.exports = function(grunt) { 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-jsrsasign', ['jsrsasign-init', 'clean', 'copy']); grunt.registerTask('deploy-requirejs', ['requirejs-init', 'clean', 'uglify']); grunt.registerTask('deploy-app-main', ['main-app-init', 'clean', 'imagemin', 'less', 'requirejs', 'concat', diff --git a/build/common.json b/build/common.json index c5fc67f31..0a7255f78 100644 --- a/build/common.json +++ b/build/common.json @@ -162,17 +162,6 @@ } } }, - "jsrsasign": { - "clean": [ - "../deploy/web-apps/vendor/jsrsasign" - ], - "copy": { - "script": { - "src": "../vendor/jsrsasign/jsrsasign-latest-all-min.js", - "dest": "../deploy/web-apps/vendor/jsrsasign/jsrsasign-latest-all-min.js" - } - } - }, "underscore": { "clean": [ "../deploy/web-apps/vendor/underscore" @@ -206,8 +195,7 @@ "deploy-underscore", "deploy-bootstrap", "deploy-jszip", - "deploy-jsziputils", - "deploy-jsrsasign" + "deploy-jsziputils" ] } } \ No newline at end of file diff --git a/build/documenteditor.json b/build/documenteditor.json index d52e43dcc..553082c2f 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -30,7 +30,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,8 +84,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": { @@ -197,7 +195,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -255,8 +252,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index b9baac281..d87eab13f 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -30,7 +30,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,8 +84,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": { @@ -197,7 +195,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -255,8 +252,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index f2cf6a84f..cea408c65 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -30,7 +30,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -85,8 +84,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": { @@ -208,7 +206,6 @@ "sockjs": "empty:", "jszip": "empty:", "jszip-utils": "empty:", - "jsrsasign": "empty:", "coapisettings": "empty:", "allfonts": "empty:", "sdk": "empty:", @@ -266,8 +263,7 @@ "xregexp", "sockjs", "jszip", - "jszip-utils", - "jsrsasign" + "jszip-utils" ] }, "gateway": {