Skip to content

R
renderjs
Commit 05f1e7de authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

Convert relative url found in body into absolute url.

parent 3a87d366
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 3 deletions
renderjs.js
View file @ 05f1e7de
...@@ -1385,7 +1385,8 @@ ...@@ -1385,7 +1385,8 @@
(new DOMParser()).parseFromString(xhr.responseText, "text/html"); (new DOMParser()).parseFromString(xhr.responseText, "text/html");
parsed_html = renderJS.parseGadgetHTMLDocument( parsed_html = renderJS.parseGadgetHTMLDocument(
tmp_constructor.__template_element, tmp_constructor.__template_element,
url url,
true
); );
for (key in parsed_html) { for (key in parsed_html) {
if (parsed_html.hasOwnProperty(key)) { if (parsed_html.hasOwnProperty(key)) {
...@@ -1490,7 +1491,8 @@ ...@@ -1490,7 +1491,8 @@
// renderJS.parseGadgetHTMLDocument // renderJS.parseGadgetHTMLDocument
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
renderJS.parseGadgetHTMLDocument = renderJS.parseGadgetHTMLDocument =
function parseGadgetHTMLDocument(document_element, url) { function parseGadgetHTMLDocument(document_element, url,
update_relative_url) {
var settings = { var settings = {
title: "", title: "",
interface_list: [], interface_list: [],
...@@ -1500,12 +1502,20 @@ ...@@ -1500,12 +1502,20 @@
}, },
i, i,
element, element,
element_list,
j,
url_attribute_list = ['src', 'href', 'srcset'],
url_attribute,
base_found = false; base_found = false;
if (!url || !isAbsoluteOrDataURL.test(url)) { if (!url || !isAbsoluteOrDataURL.test(url)) {
throw new Error("The url should be absolute: " + url); throw new Error("The url should be absolute: " + url);
} }
if (update_relative_url === undefined) {
update_relative_url = false;
}
if (document_element.nodeType === 9) { if (document_element.nodeType === 9) {
settings.title = document_element.title; settings.title = document_element.title;
...@@ -1546,6 +1556,25 @@ ...@@ -1546,6 +1556,25 @@
} }
} }
} }
if (update_relative_url && (document_element.body !== null)) {
// Resolve all relativeurl configure in the dom as absolute from
// the gadget url
for (j = 0; j < url_attribute_list.length; j += 1) {
url_attribute = url_attribute_list[j];
element_list = document_element.body.querySelectorAll(
'[' + url_attribute + ']'
);
for (i = 0; i < element_list.length; i += 1) {
element = element_list[i];
element.setAttribute(url_attribute, renderJS.getAbsoluteURL(
element.getAttribute(url_attribute),
settings.path
));
}
}
}
} else { } else {
throw new Error("The first parameter should be an HTMLDocument"); throw new Error("The first parameter should be an HTMLDocument");
} }
......
test/index.html
View file @ 05f1e7de
...@@ -39,5 +39,6 @@ See https://www.nexedi.com/licensing for rationale and options. ...@@ -39,5 +39,6 @@ See https://www.nexedi.com/licensing for rationale and options.
<h2 id="qunit-userAgent"></h2> <h2 id="qunit-userAgent"></h2>
<ol id="qunit-tests"></ol> <ol id="qunit-tests"></ol>
<div id="qunit-fixture">test markup, will be hidden</div> <div id="qunit-fixture">test markup, will be hidden</div>
<div id="check-relative-url" href='one' src='two' srcset='three'></div>
</body> </body>
</html> </html>
test/renderjs_test.js
View file @ 05f1e7de
...@@ -698,6 +698,79 @@ ...@@ -698,6 +698,79 @@
}); });
}); });
test('Convert body relative url', function () {
// Check that declareGadgetKlass converts all relative url
var url = 'https://example.org/files/qunittest/test';
this.server.respondWith("GET", url, [200, {
"Content-Type": "text/html"
}, "<html><body><div href='a' src='b' srcset='c'></div></body></html>"]);
stop();
expect(4);
renderJS.declareGadgetKlass(url)
.then(function (Klass) {
var div;
equal(Klass.__template_element.nodeType, 9);
div = Klass.__template_element.body.querySelector('div');
equal(
div.getAttribute('href'),
'https://example.org/files/qunittest/a'
);
equal(
div.getAttribute('src'),
'https://example.org/files/qunittest/b'
);
equal(
div.getAttribute('srcset'),
'https://example.org/files/qunittest/c'
);
})
.fail(function (e) {
ok(false, e);
})
.always(function () {
start();
});
});
test('Convert body relative url with base', function () {
// Check that declareGadgetKlass converts all relative url
var url = 'https://example.org/files/qunittest/test';
this.server.respondWith("GET", url, [200, {
"Content-Type": "text/html"
}, "<html><head><base href='../'></base></head>" +
"<body><div href='a' src='b' srcset='c'></div></body></html>"]);
stop();
expect(4);
renderJS.declareGadgetKlass(url)
.then(function (Klass) {
var div;
equal(Klass.__template_element.nodeType, 9);
div = Klass.__template_element.body.querySelector('div');
equal(
div.getAttribute('href'),
'https://example.org/files/a'
);
equal(
div.getAttribute('src'),
'https://example.org/files/b'
);
equal(
div.getAttribute('srcset'),
'https://example.org/files/c'
);
})
.fail(function (e) {
ok(false, e);
})
.always(function () {
start();
});
});
test('Klass is not reloaded if called twice', function () { test('Klass is not reloaded if called twice', function () {
// Check that declareGadgetKlass does not reload the gadget // Check that declareGadgetKlass does not reload the gadget
// if it has already been loaded // if it has already been loaded
...@@ -6233,7 +6306,7 @@ ...@@ -6233,7 +6306,7 @@
} }
stop(); stop();
expect(25); expect(28);
root_gadget_defer.promise root_gadget_defer.promise
.then(function (root_gadget_list) { .then(function (root_gadget_list) {
var root_gadget = root_gadget_list[0], var root_gadget = root_gadget_list[0],
...@@ -6292,6 +6365,12 @@ ...@@ -6292,6 +6365,12 @@
]); ]);
html = root_gadget.constructor.__template_element.outerHTML; html = root_gadget.constructor.__template_element.outerHTML;
ok(/^<div>\s*<h1 id="qunit-header">/.test(html), html); ok(/^<div>\s*<h1 id="qunit-header">/.test(html), html);
html = root_gadget.constructor.__template_element
.querySelector('#check-relative-url');
// relative url are not modified on the root gadget
equal(html.getAttribute('href'), 'one');
equal(html.getAttribute('src'), 'two');
equal(html.getAttribute('srcset'), 'three');
ok(root_gadget instanceof RenderJSGadget); ok(root_gadget instanceof RenderJSGadget);
ok(root_gadget_klass, root_gadget.constructor); ok(root_gadget_klass, root_gadget.constructor);
ok(root_gadget.__aq_parent !== undefined); ok(root_gadget.__aq_parent !== undefined);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7