From 919603df6cd02fa5786245ae13251c1006b29c39 Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 4 Feb 2016 21:28:46 +0000 Subject: [PATCH 1/9] usage of DOMParser utility to handle XML v1.1 (see https://github.com/readium/readium-js-viewer/issues/467) --- ...equireJS_config_multiple-bundles_external-libs.js | 4 ++-- epub_content/accessible_epub_3/EPUB/bk01-toc.xhtml | 2 +- epub_content/accessible_epub_3/EPUB/ch01.xhtml | 2 +- epub_content/accessible_epub_3/EPUB/index.xhtml | 2 +- epub_content/accessible_epub_3/EPUB/package.opf | 2 +- readium-js | 2 +- src/js/EpubLibrary.js | 12 ++++++------ src/js/EpubLibraryManager.js | 5 ++--- src/js/EpubLibraryOPDS.js | 10 +++++----- src/js/workers/EpubLibraryWriter.js | 3 ++- src/js/workers/WorkerProxy.js | 8 ++++---- 11 files changed, 26 insertions(+), 26 deletions(-) diff --git a/build-config/RequireJS_config_multiple-bundles_external-libs.js b/build-config/RequireJS_config_multiple-bundles_external-libs.js index 8a4c71ece..5b00f965d 100644 --- a/build-config/RequireJS_config_multiple-bundles_external-libs.js +++ b/build-config/RequireJS_config_multiple-bundles_external-libs.js @@ -27,8 +27,8 @@ require.config({ "mime-types", "zip", "zip-ext", "zip-fs", "cryptoJs/sha1", "cryptoJs/core", 'jquery', 'underscore', 'URIjs', 'punycode', 'SecondLevelDomains', 'IPv6', - 'jquerySizes', 'domReady', 'eventEmitter', 'console_shim', - 'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position'] + 'domReady', 'eventEmitter', 'console_shim', + 'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position'] //'jquerySizes' } ] }); diff --git a/epub_content/accessible_epub_3/EPUB/bk01-toc.xhtml b/epub_content/accessible_epub_3/EPUB/bk01-toc.xhtml index b591c28b5..7099b7127 100644 --- a/epub_content/accessible_epub_3/EPUB/bk01-toc.xhtml +++ b/epub_content/accessible_epub_3/EPUB/bk01-toc.xhtml @@ -1,4 +1,4 @@ - + diff --git a/epub_content/accessible_epub_3/EPUB/ch01.xhtml b/epub_content/accessible_epub_3/EPUB/ch01.xhtml index 48197fead..21ff7457f 100644 --- a/epub_content/accessible_epub_3/EPUB/ch01.xhtml +++ b/epub_content/accessible_epub_3/EPUB/ch01.xhtml @@ -1,4 +1,4 @@ - + diff --git a/epub_content/accessible_epub_3/EPUB/index.xhtml b/epub_content/accessible_epub_3/EPUB/index.xhtml index 2527390a3..2c0c75a8b 100644 --- a/epub_content/accessible_epub_3/EPUB/index.xhtml +++ b/epub_content/accessible_epub_3/EPUB/index.xhtml @@ -1,4 +1,4 @@ - + diff --git a/epub_content/accessible_epub_3/EPUB/package.opf b/epub_content/accessible_epub_3/EPUB/package.opf index 2548ab635..3d83d15e0 100644 --- a/epub_content/accessible_epub_3/EPUB/package.opf +++ b/epub_content/accessible_epub_3/EPUB/package.opf @@ -1,4 +1,4 @@ - + diff --git a/readium-js b/readium-js index 2666ea1a3..ce7af5a0f 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 2666ea1a38647ce70899a39ec1210c357a55d047 +Subproject commit ce7af5a0f925f745acec8afd733f529557bde095 diff --git a/src/js/EpubLibrary.js b/src/js/EpubLibrary.js index 6a70686a3..6339440f7 100644 --- a/src/js/EpubLibrary.js +++ b/src/js/EpubLibrary.js @@ -21,7 +21,8 @@ define([ 'Analytics', './Keyboard', './versioning/ReadiumVersioning', -'readium_shared_js/helpers'], +'readium_shared_js/helpers', +'readium_cfi_js/XmlParse'], function( moduleConfig, @@ -46,7 +47,8 @@ Messages, Analytics, Keyboard, Versioning, -Helpers){ +Helpers, +XmlParse){ var detailsDialogStr = DetailsDialog({strings: Strings}); @@ -188,8 +190,7 @@ Helpers){ $.get(urlContainerXml, function(data){ if(typeof(data) === "string" ) { - var parser = new window.DOMParser; - data = parser.parseFromString(data, 'text/xml'); + data = XmlParse.fromString(data); } var $rootfile = $('rootfile', data); var rootFilePath = $rootfile.attr('full-path'); @@ -253,8 +254,7 @@ Helpers){ // $.get(epub.rootUrl + "/META-INF/container.xml", function(data){ // if(typeof(data) === "string" ) { - // var parser = new window.DOMParser; - // data = parser.parseFromString(data, 'text/xml'); + // data = XmlParse.fromString(data); // } // var $rootfile = $('rootfile', data); // epub.packagePath = $rootfile.attr('full-path'); diff --git a/src/js/EpubLibraryManager.js b/src/js/EpubLibraryManager.js index 22692bbb2..4458cff73 100644 --- a/src/js/EpubLibraryManager.js +++ b/src/js/EpubLibraryManager.js @@ -1,4 +1,4 @@ -define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', 'StorageManager', 'i18nStrings', 'URIjs', './EpubLibraryOPDS'], function ($, moduleConfig, PackageParser, WorkerProxy, StorageManager, Strings, URI, EpubLibraryOPDS) { +define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', 'StorageManager', 'i18nStrings', 'URIjs', './EpubLibraryOPDS', 'readium_cfi_js/XmlParse'], function ($, moduleConfig, PackageParser, WorkerProxy, StorageManager, Strings, URI, EpubLibraryOPDS, XmlParse) { var LibraryManager = function(){ }; @@ -107,8 +107,7 @@ define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', $.get(packageUrl, function(data){ if(typeof(data) === "string" ) { - var parser = new window.DOMParser; - data = parser.parseFromString(data, 'text/xml'); + data = XmlParse.fromString(data); } var jsonObj = PackageParser.parsePackageDom(data, packageUrl); jsonObj.coverHref = jsonObj.coverHref ? self._getFullUrl(packageUrl, jsonObj.coverHref) : undefined; diff --git a/src/js/EpubLibraryOPDS.js b/src/js/EpubLibraryOPDS.js index 43f956c91..9638f26fe 100644 --- a/src/js/EpubLibraryOPDS.js +++ b/src/js/EpubLibraryOPDS.js @@ -1,15 +1,15 @@ define([ './ModuleConfig', 'jquery', -'readium_shared_js/helpers', -'URIjs' +'URIjs', +'readium_cfi_js/XmlParse' ], function( moduleConfig, $, -Helpers, -URI){ +URI, +XmlParse){ var processOPDS = function(opdsURL, data, dataSuccess, dataFail) { @@ -61,7 +61,7 @@ URI){ } if (typeof data === "string") { - data = $.parseXML(data); + data = XmlParse.fromString(data); } $xml = $(data); diff --git a/src/js/workers/EpubLibraryWriter.js b/src/js/workers/EpubLibraryWriter.js index d258738c4..7cb048975 100644 --- a/src/js/workers/EpubLibraryWriter.js +++ b/src/js/workers/EpubLibraryWriter.js @@ -131,7 +131,8 @@ define(['StorageManager', '../storage/ZipFileLoader', '../storage/UnpackedDirLoa this.fileLoader.loadFile(path, function(blob){ if (blob){ fileReader.onload = function() { - // var xmlDom = (new DOMParser()).parseFromString(this.result, "text/xml"); + // readium_cfi_js/XmlParse + // var xmlDom = XmlParse.fromString(this.result); callback(this.result); }; diff --git a/src/js/workers/WorkerProxy.js b/src/js/workers/WorkerProxy.js index 06509c2d6..beb65eb63 100644 --- a/src/js/workers/WorkerProxy.js +++ b/src/js/workers/WorkerProxy.js @@ -1,4 +1,4 @@ -define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_js/epub-fetch/encryption_handler'], function(moduleConfig, Messages, $, PackageParser, EncryptionHandler){ +define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_js/epub-fetch/encryption_handler', 'readium_cfi_js/XmlParse'], function(moduleConfig, Messages, $, PackageParser, EncryptionHandler, XmlParse){ var worker; var cleanupWorker = function(){ @@ -60,7 +60,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ } break; case Messages.FIND_PACKAGE: - var containerDom = (new DOMParser()).parseFromString(data.containerStr, "text/xml"); + var containerDom = XmlParse.fromString(data.containerStr); var $rootfile = $('rootfile', containerDom); if (!$rootfile.length){ error(Messages.ERROR_EPUB); @@ -71,7 +71,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ } break; case Messages.PARSE_PACKAGE: - var packageDom = (new DOMParser()).parseFromString(data.packageStr, "text/xml"); + var packageDom = XmlParse.fromString(data.packageStr); var errors = $(packageDom).find('parsererror'); if (errors.length) { error(Messages.ERROR_PACKAGE_PARSE, $(errors).find('div').text()); @@ -82,7 +82,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ var encryptionData; if(data.encryptionStr) { - var encryptionDom = (new DOMParser()).parseFromString(data.encryptionStr, "text/xml"); + var encryptionDom = XmlParse.fromString(data.encryptionStr); encryptionData = EncryptionHandler.CreateEncryptionData(packageObj.id, encryptionDom); } From 5a462fe434bd06895502b3121a5b9ddb6bdc6f84 Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 4 Feb 2016 21:43:10 +0000 Subject: [PATCH 2/9] restored jQuerySizes --- .../RequireJS_config_multiple-bundles_external-libs.js | 4 ++-- readium-js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-config/RequireJS_config_multiple-bundles_external-libs.js b/build-config/RequireJS_config_multiple-bundles_external-libs.js index 5b00f965d..8a4c71ece 100644 --- a/build-config/RequireJS_config_multiple-bundles_external-libs.js +++ b/build-config/RequireJS_config_multiple-bundles_external-libs.js @@ -27,8 +27,8 @@ require.config({ "mime-types", "zip", "zip-ext", "zip-fs", "cryptoJs/sha1", "cryptoJs/core", 'jquery', 'underscore', 'URIjs', 'punycode', 'SecondLevelDomains', 'IPv6', - 'domReady', 'eventEmitter', 'console_shim', - 'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position'] //'jquerySizes' + 'jquerySizes', 'domReady', 'eventEmitter', 'console_shim', + 'rangy', 'rangy-core', 'rangy-textrange', 'rangy-highlighter', 'rangy-cssclassapplier', 'rangy-position'] } ] }); diff --git a/readium-js b/readium-js index ce7af5a0f..89c63b607 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit ce7af5a0f925f745acec8afd733f529557bde095 +Subproject commit 89c63b607b7ed465aa79127ecb9e9c149d9bc314 From 9908afeff213f67f3ba6caf1305dfbfb3c38c0bb Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 4 Feb 2016 22:52:11 +0000 Subject: [PATCH 3/9] OPDS with XML v1.1 to test parser update --- epub_content/epub_library.opds | 2 +- readium-js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epub_content/epub_library.opds b/epub_content/epub_library.opds index d9f566305..5d080dd34 100644 --- a/epub_content/epub_library.opds +++ b/epub_content/epub_library.opds @@ -1,4 +1,4 @@ - + diff --git a/readium-js b/readium-js index 89c63b607..897dd6d29 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 89c63b607b7ed465aa79127ecb9e9c149d9bc314 +Subproject commit 897dd6d291f85e52d4a680c229eb5d39db5cb740 From 0c4ed7ffd4b50928299b42d1cc74bce93437c974 Mon Sep 17 00:00:00 2001 From: danielweck Date: Mon, 8 Feb 2016 18:12:35 +0000 Subject: [PATCH 4/9] fixes https://github.com/readium/readium-js-viewer/issues/484 --- readium-js | 2 +- src/js/EpubLibrary.js | 4 +-- src/js/EpubLibraryManager.js | 2 +- src/js/EpubLibraryOPDS.js | 2 +- src/js/EpubReader.js | 38 ++++++++++++++++++++--------- src/js/workers/EpubLibraryWriter.js | 2 +- src/js/workers/WorkerProxy.js | 6 ++--- 7 files changed, 36 insertions(+), 20 deletions(-) diff --git a/readium-js b/readium-js index 897dd6d29..c625353d8 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 897dd6d291f85e52d4a680c229eb5d39db5cb740 +Subproject commit c625353d82132d9f38e28d73f507d8eeb1844340 diff --git a/src/js/EpubLibrary.js b/src/js/EpubLibrary.js index 6339440f7..244e05178 100644 --- a/src/js/EpubLibrary.js +++ b/src/js/EpubLibrary.js @@ -190,7 +190,7 @@ XmlParse){ $.get(urlContainerXml, function(data){ if(typeof(data) === "string" ) { - data = XmlParse.fromString(data); + data = XmlParse.fromString(data, "text/xml"); } var $rootfile = $('rootfile', data); var rootFilePath = $rootfile.attr('full-path'); @@ -254,7 +254,7 @@ XmlParse){ // $.get(epub.rootUrl + "/META-INF/container.xml", function(data){ // if(typeof(data) === "string" ) { - // data = XmlParse.fromString(data); + // data = XmlParse.fromString(data, "text/xml"); // } // var $rootfile = $('rootfile', data); // epub.packagePath = $rootfile.attr('full-path'); diff --git a/src/js/EpubLibraryManager.js b/src/js/EpubLibraryManager.js index 4458cff73..3e87818fe 100644 --- a/src/js/EpubLibraryManager.js +++ b/src/js/EpubLibraryManager.js @@ -107,7 +107,7 @@ define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', $.get(packageUrl, function(data){ if(typeof(data) === "string" ) { - data = XmlParse.fromString(data); + data = XmlParse.fromString(data, "text/xml"); } var jsonObj = PackageParser.parsePackageDom(data, packageUrl); jsonObj.coverHref = jsonObj.coverHref ? self._getFullUrl(packageUrl, jsonObj.coverHref) : undefined; diff --git a/src/js/EpubLibraryOPDS.js b/src/js/EpubLibraryOPDS.js index 9638f26fe..404465578 100644 --- a/src/js/EpubLibraryOPDS.js +++ b/src/js/EpubLibraryOPDS.js @@ -61,7 +61,7 @@ XmlParse){ } if (typeof data === "string") { - data = XmlParse.fromString(data); + data = XmlParse.fromString(data, "text/xml"); } $xml = $(data); diff --git a/src/js/EpubReader.js b/src/js/EpubReader.js index 1bfb03d74..01f618713 100644 --- a/src/js/EpubReader.js +++ b/src/js/EpubReader.js @@ -227,32 +227,44 @@ Helpers){ var tocNav; var $navs = $('nav', dom); - Array.prototype.every.call($navs, function(nav){ - if (nav.getAttributeNS('http://www.idpf.org/2007/ops', 'type') == 'toc'){ + Array.prototype.every.call($navs, function(nav) { + + var attr = Helpers.getEpubTypeRoleAttributeValue(nav); + + if (attr && ((attr.indexOf('toc') >= 0) || (attr.indexOf('doc-toc') >= 0))) { // TODO: tighter regexp check, with token-separated values (space character? depends on EPUB3 epub:type vs. ARIA role?) tocNav = nav; return false; } + return true; }); - + var isRTL = false; var pparent = tocNav; - while (pparent && pparent.getAttributeNS) + while (pparent) { - var dir = pparent.getAttributeNS("http://www.w3.org/1999/xhtml", "dir") || pparent.getAttribute("dir"); - + var dir = undefined; + if (pparent.getAttributeNS) { + dir = pparent.getAttributeNS("http://www.w3.org/1999/xhtml", "dir"); + } + if (!dir) { + if (pparent.getAttribute) { + dir = pparent.getAttribute("dir"); + } + } + if (dir && dir === "rtl") { isRTL = true; break; } + pparent = pparent.parentNode; } var toc = (tocNav && $(tocNav).html()) || $('body', dom).html() || $(dom).html(); - var tocUrl = currentPackageDocument.getToc(); - + if (toc && toc.length) { var $toc = $(toc); @@ -276,7 +288,7 @@ Helpers){ } } else { - var tocUrl = currentPackageDocument.getToc(); + var tocUrl = currentPackageDocument.getTocURI(); $('#readium-toc-body').append("?? " + tocUrl); } @@ -404,13 +416,17 @@ Helpers){ { try { spin(true); - + var href = $(this).attr('href'); + + //var tocUrl = currentPackageDocument.getTocURI(); //href = tocUrl ? new URI(href).absoluteTo(tocUrl).toString() : href; _tocLinkActivated = true; - readium.reader.openContentUrl(href, tocUrl, undefined); + var tocHref = currentPackageDocument.getTocHref(); + + readium.reader.openContentUrl(href, tocHref, undefined); if (embedded) { $('.toc-visible').removeClass('toc-visible'); diff --git a/src/js/workers/EpubLibraryWriter.js b/src/js/workers/EpubLibraryWriter.js index 7cb048975..9dd1aae6f 100644 --- a/src/js/workers/EpubLibraryWriter.js +++ b/src/js/workers/EpubLibraryWriter.js @@ -132,7 +132,7 @@ define(['StorageManager', '../storage/ZipFileLoader', '../storage/UnpackedDirLoa if (blob){ fileReader.onload = function() { // readium_cfi_js/XmlParse - // var xmlDom = XmlParse.fromString(this.result); + // var xmlDom = XmlParse.fromString(this.result, "text/xml"); callback(this.result); }; diff --git a/src/js/workers/WorkerProxy.js b/src/js/workers/WorkerProxy.js index beb65eb63..b3f7a0c2e 100644 --- a/src/js/workers/WorkerProxy.js +++ b/src/js/workers/WorkerProxy.js @@ -60,7 +60,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ } break; case Messages.FIND_PACKAGE: - var containerDom = XmlParse.fromString(data.containerStr); + var containerDom = XmlParse.fromString(data.containerStr, "text/xml"); var $rootfile = $('rootfile', containerDom); if (!$rootfile.length){ error(Messages.ERROR_EPUB); @@ -71,7 +71,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ } break; case Messages.PARSE_PACKAGE: - var packageDom = XmlParse.fromString(data.packageStr); + var packageDom = XmlParse.fromString(data.packageStr, "text/xml"); var errors = $(packageDom).find('parsererror'); if (errors.length) { error(Messages.ERROR_PACKAGE_PARSE, $(errors).find('div').text()); @@ -82,7 +82,7 @@ define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_ var encryptionData; if(data.encryptionStr) { - var encryptionDom = XmlParse.fromString(data.encryptionStr); + var encryptionDom = XmlParse.fromString(data.encryptionStr, "text/xml"); encryptionData = EncryptionHandler.CreateEncryptionData(packageObj.id, encryptionDom); } From bfe886749a5724f25c942423b41ddf20319dd472 Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 8 Mar 2016 14:40:42 +0000 Subject: [PATCH 5/9] submodule --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index 4e81c296c..6ae3c086f 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 4e81c296c13620e90d61e0bea07f69412c705aa7 +Subproject commit 6ae3c086f2b2f6f612afc4f0ac82b4379efa3169 From 96dd93029da792701f2339e809945cbfb4c13995 Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 26 Apr 2016 16:18:23 +0100 Subject: [PATCH 6/9] submod --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index 9c0b067fc..bb42b64b1 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit 9c0b067fc4b86b46aadbbaaab3c5d9cf3209beaf +Subproject commit bb42b64b1fddefdab58ff0473e27930df55fc18f From 558e4e7e5850206556ffae6c3f9c10b514d7ed7e Mon Sep 17 00:00:00 2001 From: danielweck Date: Tue, 26 Apr 2016 16:22:45 +0100 Subject: [PATCH 7/9] fix merge error --- src/js/EpubReader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/EpubReader.js b/src/js/EpubReader.js index 2700f55be..b8d83c866 100644 --- a/src/js/EpubReader.js +++ b/src/js/EpubReader.js @@ -569,7 +569,7 @@ BookmarkData){ _tocLinkActivated = true; - var tocHref = currentPackageDocument.getTocHref(); + var tocHref = currentPackageDocument.getToc(); readium.reader.openContentUrl(href, tocHref, undefined); From 26b93420070c454a576e515f12a340549a512a6c Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 25 May 2017 16:26:36 +0100 Subject: [PATCH 8/9] isubmodule --- readium-js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readium-js b/readium-js index c5c92d079..707ec99b7 160000 --- a/readium-js +++ b/readium-js @@ -1 +1 @@ -Subproject commit c5c92d0795f806d613ce41bb1cdf9a8717a05eb7 +Subproject commit 707ec99b783c23d77faa836fbfd1a86e75506aa7 From 05704b3385afc2d15bd6ea7f83da9178c19f7a1f Mon Sep 17 00:00:00 2001 From: danielweck Date: Thu, 2 Aug 2018 12:03:54 +0100 Subject: [PATCH 9/9] XmlParse now in readium-shared-js --- src/js/EpubLibrary.js | 2 +- src/js/EpubLibraryManager.js | 2 +- src/js/EpubLibraryOPDS.js | 2 +- src/js/workers/EpubLibraryWriter.js | 2 +- src/js/workers/WorkerProxy.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/js/EpubLibrary.js b/src/js/EpubLibrary.js index ff7053bfc..5b3d59165 100644 --- a/src/js/EpubLibrary.js +++ b/src/js/EpubLibrary.js @@ -22,7 +22,7 @@ define([ './Keyboard', './versioning/ReadiumVersioning', 'readium_shared_js/helpers', -'readium_cfi_js/XmlParse'], +'readium_shared_js/XmlParse'], function( moduleConfig, diff --git a/src/js/EpubLibraryManager.js b/src/js/EpubLibraryManager.js index 3e87818fe..a6bf3ddbc 100644 --- a/src/js/EpubLibraryManager.js +++ b/src/js/EpubLibraryManager.js @@ -1,4 +1,4 @@ -define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', 'StorageManager', 'i18nStrings', 'URIjs', './EpubLibraryOPDS', 'readium_cfi_js/XmlParse'], function ($, moduleConfig, PackageParser, WorkerProxy, StorageManager, Strings, URI, EpubLibraryOPDS, XmlParse) { +define(['jquery', './ModuleConfig', './PackageParser', './workers/WorkerProxy', 'StorageManager', 'i18nStrings', 'URIjs', './EpubLibraryOPDS', 'readium_shared_js/XmlParse'], function ($, moduleConfig, PackageParser, WorkerProxy, StorageManager, Strings, URI, EpubLibraryOPDS, XmlParse) { var LibraryManager = function(){ }; diff --git a/src/js/EpubLibraryOPDS.js b/src/js/EpubLibraryOPDS.js index 5fda82166..ae08fd058 100644 --- a/src/js/EpubLibraryOPDS.js +++ b/src/js/EpubLibraryOPDS.js @@ -2,7 +2,7 @@ define([ './ModuleConfig', 'jquery', 'URIjs', -'readium_cfi_js/XmlParse' +'readium_shared_js/XmlParse' ], function( diff --git a/src/js/workers/EpubLibraryWriter.js b/src/js/workers/EpubLibraryWriter.js index 01e27d60c..e7874041f 100644 --- a/src/js/workers/EpubLibraryWriter.js +++ b/src/js/workers/EpubLibraryWriter.js @@ -131,7 +131,7 @@ define(['StorageManager', '../storage/ZipFileLoader', '../storage/UnpackedDirLoa this.fileLoader.loadFile(path, function(blob){ if (blob){ fileReader.onload = function() { - // readium_cfi_js/XmlParse + // readium_shared_js/XmlParse // var xmlDom = XmlParse.fromString(this.result, "text/xml"); callback(this.result); }; diff --git a/src/js/workers/WorkerProxy.js b/src/js/workers/WorkerProxy.js index b3f7a0c2e..17852359d 100644 --- a/src/js/workers/WorkerProxy.js +++ b/src/js/workers/WorkerProxy.js @@ -1,4 +1,4 @@ -define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_js/epub-fetch/encryption_handler', 'readium_cfi_js/XmlParse'], function(moduleConfig, Messages, $, PackageParser, EncryptionHandler, XmlParse){ +define(['../ModuleConfig', './Messages', 'jquery', '../PackageParser', 'readium_js/epub-fetch/encryption_handler', 'readium_shared_js/XmlParse'], function(moduleConfig, Messages, $, PackageParser, EncryptionHandler, XmlParse){ var worker; var cleanupWorker = function(){