Explorar el Código

made code compatible with node v8

Gildas hace 7 años
padre
commit
a1a414b995

+ 8 - 2
lib/single-file/single-file-browser.js

@@ -18,7 +18,8 @@
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-/* global 
+/* global
+	URL,
 	DocUtilCore,
 	DocUtilCore,
 	cssTree,
 	cssTree,
 	docHelper,
 	docHelper,
@@ -57,7 +58,8 @@ this.SingleFileBrowser = this.SingleFileBrowser || (() => {
 		parseSVGContent,
 		parseSVGContent,
 		isValidFontUrl,
 		isValidFontUrl,
 		getContentSize,
 		getContentSize,
-		digestText
+		digestText,
+		parseURL
 	};
 	};
 	let fetchResource;
 	let fetchResource;
 	return {
 	return {
@@ -151,4 +153,8 @@ this.SingleFileBrowser = this.SingleFileBrowser || (() => {
 		}
 		}
 	}
 	}
 
 
+	function parseURL(resourceURL, baseURI) {
+		return new URL(resourceURL, baseURI);
+	}
+
 })();
 })();

+ 1 - 3
lib/single-file/util/doc-util-core.js

@@ -18,8 +18,6 @@
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  *   along with SingleFile.  If not, see <http://www.gnu.org/licenses/>.
  */
  */
 
 
-/* global URL */
-
 this.DocUtilCore = this.DocUtilCore || (() => {
 this.DocUtilCore = this.DocUtilCore || (() => {
 
 
 	const DEBUG = false;
 	const DEBUG = false;
@@ -124,7 +122,7 @@ this.DocUtilCore = this.DocUtilCore || (() => {
 				}
 				}
 
 
 				static parseURL(resourceURL, baseURI) {
 				static parseURL(resourceURL, baseURI) {
-					return new URL(resourceURL, baseURI);
+					return domUtil.parseURL(resourceURL, baseURI);
 				}
 				}
 
 
 				static resolveURL(resourceURL, baseURI) {
 				static resolveURL(resourceURL, baseURI) {

+ 7 - 1
node-jsdom/single-file-jsdom.js

@@ -27,6 +27,7 @@ const fs = require("fs");
 const crypto = require("crypto");
 const crypto = require("crypto");
 
 
 const jsdom = require("jsdom");
 const jsdom = require("jsdom");
+const { URL } = require('url');
 const dataUri = require("strong-data-uri");
 const dataUri = require("strong-data-uri");
 const iconv = require("iconv-lite");
 const iconv = require("iconv-lite");
 const request = require("request-promise-native");
 const request = require("request-promise-native");
@@ -72,7 +73,8 @@ const domUtil = {
 	parseSVGContent,
 	parseSVGContent,
 	isValidFontUrl,
 	isValidFontUrl,
 	getContentSize,
 	getContentSize,
-	digestText
+	digestText,
+	parseURL
 };
 };
 
 
 exports.getClass = () => {
 exports.getClass = () => {
@@ -148,4 +150,8 @@ async function getResourceContent(resourceURL, options) {
 			return dataUri.encode(resourceContent.body, contentType || this.getContentType());
 			return dataUri.encode(resourceContent.body, contentType || this.getContentType());
 		}
 		}
 	};
 	};
+}
+
+function parseURL(resourceURL, baseURI) {
+	return new URL(resourceURL, baseURI);
 }
 }