Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(engine): closes #486 to lowercase tag names #494

Merged
merged 2 commits into from
Jul 11, 2018
Merged

fix(engine): closes #486 to lowercase tag names #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
176a6ac
fix(engine): closes #486 to lowercase tag names
caridy Jul 11, 2018
fbdc3bf
fix(engine): PR 494 feedback
caridy Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/lwc-engine/src/3rdparty/polymer/outer-html.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { getInnerHTML } from "./inner-html";
// http://www.whatwg.org/specs/web-apps/current-work/multipage/the-end.html#escapingString
const escapeAttrRegExp = /[&\u00A0"]/g;
const escapeDataRegExp = /[&\u00A0<>]/g;
const replace = String.prototype.replace;
const { replace, toLowerCase } = String.prototype;

function escapeReplace(c) {
switch (c) {
Expand Down Expand Up @@ -75,15 +75,15 @@ export function getOuterHTML(node: Node): string {
switch (node.nodeType) {
case Node.ELEMENT_NODE: {
const { tagName, attributes: attrs } = node as Element;
let s = '<' + tagName;
let s = '<' + toLowerCase.call(tagName);
for (let i = 0, attr; (attr = attrs[i]); i++) {
s += ' ' + attr.name + '="' + escapeAttr(attr.value) + '"';
}
s += '>';
if (voidElements.has(tagName)) {
return s;
}
return s + getInnerHTML(node) + '</' + tagName + '>';
return s + getInnerHTML(node) + '</' + toLowerCase.call(tagName) + '>';
}
case Node.TEXT_NODE: {
const { data, parentNode } = node as Text;
Expand Down
8 changes: 4 additions & 4 deletions packages/lwc-engine/src/faux-shadow/__tests__/dom-inspection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,16 @@ describe('DOM inspection', () => {
describe('#innerHTML', () => {
it('should implement elm.innerHTML shadow dom semantics', () => {
const p = getHostShadowRoot(element).querySelector('x-parent');
expect(p.innerHTML).toBe('<DIV class=\"first\">Passed Text</DIV>');
expect(getHostShadowRoot(p).querySelector('div').innerHTML).toBe('Before[<SLOT name=\"\"></SLOT>]After');
expect(p.innerHTML).toBe('<div class=\"first\">Passed Text</div>');
expect(getHostShadowRoot(p).querySelector('div').innerHTML).toBe('Before[<slot name=\"\"></slot>]After');
});
});

describe('#outerHTML', () => {
it('should implement elm.outerHTML shadow dom semantics', () => {
const p = getHostShadowRoot(element).querySelector('x-parent');
expect(p.outerHTML).toBe('<X-PARENT><DIV class=\"first\">Passed Text</DIV></X-PARENT>');
expect(getHostShadowRoot(p).querySelector('div').outerHTML).toBe('<DIV class=\"portal\">Before[<SLOT name=\"\"></SLOT>]After</DIV>');
expect(p.outerHTML).toBe('<x-parent><div class=\"first\">Passed Text</div></x-parent>');
expect(getHostShadowRoot(p).querySelector('div').outerHTML).toBe('<div class=\"portal\">Before[<slot name=\"\"></slot>]After</div>');
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/lwc-integration/src/components/dom/test-element-innerhtml/element-innerhtml.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ describe('custom element text content', () => {
});

it('should return correct innerHTML', function () {
assert.equal(browser.getText('p'), '<DIV>Slot</DIV>');
assert.equal(browser.getText('p'), '<div>Slot</div>');
});
});
2 changes: 1 addition & 1 deletion packages/lwc-integration/src/components/dom/test-element-outerhtml/element-outerhtml.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ describe('custom element text content', () => {
});

it('should return correct innerHTML', function () {
assert.equal(browser.getText('p'), '<X-CHILD><DIV>Slot</DIV></X-CHILD>');
assert.equal(browser.getText('p'), '<x-child><div>Slot</div></x-child>');
});
});