8214856: Errors with JSZip in web console after upgrade to 3.1.5
Reviewed-by: hannesw
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js Wed Dec 05 21:18:27 2018 -0800
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js Thu Dec 06 11:54:39 2018 +0530
@@ -36,45 +36,55 @@
createElem(doc, tag, 'jquery/jszip-utils/dist/jszip-utils-ie.js');
}
createElem(doc, tag, 'search.js');
-
+
$.get(pathtoroot + "module-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "module-search-index.zip", function(e, data) {
- var zip = new JSZip(data);
- zip.load(data);
- moduleSearchIndex = JSON.parse(zip.file("module-search-index.json").asText());
+ JSZip.loadAsync(data).then(function(zip){
+ zip.file("module-search-index.json").async("text").then(function(content){
+ moduleSearchIndex = JSON.parse(content);
+ });
+ });
});
});
$.get(pathtoroot + "package-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "package-search-index.zip", function(e, data) {
- var zip = new JSZip(data);
- zip.load(data);
- packageSearchIndex = JSON.parse(zip.file("package-search-index.json").asText());
+ JSZip.loadAsync(data).then(function(zip){
+ zip.file("package-search-index.json").async("text").then(function(content){
+ packageSearchIndex = JSON.parse(content);
+ });
+ });
});
});
$.get(pathtoroot + "type-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "type-search-index.zip", function(e, data) {
- var zip = new JSZip(data);
- zip.load(data);
- typeSearchIndex = JSON.parse(zip.file("type-search-index.json").asText());
+ JSZip.loadAsync(data).then(function(zip){
+ zip.file("type-search-index.json").async("text").then(function(content){
+ typeSearchIndex = JSON.parse(content);
+ });
+ });
});
});
$.get(pathtoroot + "member-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "member-search-index.zip", function(e, data) {
- var zip = new JSZip(data);
- zip.load(data);
- memberSearchIndex = JSON.parse(zip.file("member-search-index.json").asText());
+ JSZip.loadAsync(data).then(function(zip){
+ zip.file("member-search-index.json").async("text").then(function(content){
+ memberSearchIndex = JSON.parse(content);
+ });
+ });
});
});
$.get(pathtoroot + "tag-search-index.zip")
.done(function() {
JSZipUtils.getBinaryContent(pathtoroot + "tag-search-index.zip", function(e, data) {
- var zip = new JSZip(data);
- zip.load(data);
- tagSearchIndex = JSON.parse(zip.file("tag-search-index.json").asText());
+ JSZip.loadAsync(data).then(function(zip){
+ zip.file("tag-search-index.json").async("text").then(function(content){
+ tagSearchIndex = JSON.parse(content);
+ });
+ });
});
});
if (!moduleSearchIndex) {