diff --git a/lib/jsdom.js b/lib/jsdom.js index 3d40553f15..19efa8d142 100644 --- a/lib/jsdom.js +++ b/lib/jsdom.js @@ -15,7 +15,6 @@ const domToHtml = require("./jsdom/browser/domtohtml").domToHtml; const Window = require("./jsdom/browser/Window"); const resourceLoader = require("./jsdom/browser/resource-loader"); const VirtualConsole = require("./jsdom/virtual-console"); -const locationInfo = require("./jsdom/living/helpers/internal-constants").locationInfo; const idlUtils = require("./jsdom/living/generated/utils"); require("./jsdom/living"); // Enable living standard features @@ -41,7 +40,7 @@ exports.createCookieJar = function () { }; exports.nodeLocation = function (node) { - return idlUtils.implForWrapper(node)[locationInfo]; + return idlUtils.implForWrapper(node).__location; }; exports.reconfigureWindow = function (window, newProps) { diff --git a/lib/jsdom/living/helpers/internal-constants.js b/lib/jsdom/living/helpers/internal-constants.js index ab03dbfcdd..6b473a4db4 100644 --- a/lib/jsdom/living/helpers/internal-constants.js +++ b/lib/jsdom/living/helpers/internal-constants.js @@ -2,7 +2,6 @@ const SymbolTree = require("symbol-tree"); exports.cloningSteps = Symbol("cloning steps"); -exports.locationInfo = Symbol("location info"); exports.accept = Symbol("accept"); exports.requestManager = Symbol("request manager"); exports.pool = Symbol("pool"); diff --git a/test/jsdom/node-location.js b/test/jsdom/node-location.js index e253517464..3910322a08 100644 --- a/test/jsdom/node-location.js +++ b/test/jsdom/node-location.js @@ -12,12 +12,12 @@ describe("jsdom/node-location", () => { const el = document.querySelector("p"); const location = jsdom.nodeLocation(el); - assert.strictEqual(location.start, 0); - assert.strictEqual(location.end, 12); - assert.strictEqual(location.startTag.start, 0); - assert.strictEqual(location.startTag.end, 3); - assert.strictEqual(location.endTag.start, 8); - assert.strictEqual(location.endTag.end, 12); + assert.strictEqual(location.startOffset, 0); + assert.strictEqual(location.endOffset, 12); + assert.strictEqual(location.startTag.startOffset, 0); + assert.strictEqual(location.startTag.endOffset, 3); + assert.strictEqual(location.endTag.startOffset, 8); + assert.strictEqual(location.endTag.endOffset, 12); }); specify("jsdom.nodeLocation on a text node", () => { @@ -25,8 +25,8 @@ describe("jsdom/node-location", () => { const el = document.querySelector("p"); const location = jsdom.nodeLocation(el.firstChild); - assert.strictEqual(location.start, 3); - assert.strictEqual(location.end, 8); + assert.strictEqual(location.startOffset, 3); + assert.strictEqual(location.endOffset, 8); }); specify("jsdom.nodeLocation on a void element", () => { @@ -36,7 +36,7 @@ describe("jsdom/node-location", () => { const el = document.querySelector("img"); const location = jsdom.nodeLocation(el); - assert.strictEqual(location.start, 13); - assert.strictEqual(location.end, 32); + assert.strictEqual(location.startOffset, 15); + assert.strictEqual(location.endOffset, 34); }); });