msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

Merge pull request #1627 from sveltejs/gh-1598

Browse Source 
Always stringify text node data
pull/1629/head
Rich Harris 6 years ago committed by GitHub
parent 814a32357f a823ff32a9
commit 6012c965ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 85 additions and 31 deletions
Show Stats Download Patch File Download Diff File

2
src/compile/nodes/MustacheTag.ts
Unescape View File

@ -10,7 +10,7 @@ export default class MustacheTag extends Tag {
) {
const { init } = this.renameThisMethod(
block,
value => `${this.var}.data = ${value};`
value => `@setData(${this.var}, ${value});`
);
block.addElement(

4
src/shared/dom.js
Unescape View File

@ -155,6 +155,10 @@ export function claimText (nodes, data) {
return createText(data);
}
export function setData(text, data) {
text.data = '' + data;
}
export function setInputType(input, type) {
try {
input.type = type;

6
test/cli/samples/globals/expected/Main.js
Unescape View File

@ -26,7 +26,7 @@ var Main = (function(answer) { "use strict";
p(changed, ctx) {
if (changed.answer) {
text_1.data = ctx.answer;
setData(text_1, ctx.answer);
}
},
@ -80,6 +80,10 @@ var Main = (function(answer) { "use strict";
target.appendChild(node);
}
function setData(text, data) {
text.data = '' + data;
}
function detachNode(node) {
node.parentNode.removeChild(node);
}

6
test/cli/samples/store/expected/Main.js
Unescape View File

@ -18,7 +18,7 @@ function create_main_fragment(component, ctx) {
p(changed, ctx) {
if (changed.$name) {
text_1.data = ctx.$name;
setData(text_1, ctx.$name);
}
},
@ -75,6 +75,10 @@ function appendNode(node, target) {
target.appendChild(node);
}
function setData(text, data) {
text.data = '' + data;
}
function detachNode(node) {
node.parentNode.removeChild(node);
}

6
test/js/samples/collapses-text-around-comments/expected-bundle.js
Unescape View File

@ -25,6 +25,10 @@ function createText(data) {
return document.createTextNode(data);
}
function setData(text, data) {
text.data = '' + data;
}
function blankObject() {
return Object.create(null);
}
@ -167,7 +171,7 @@ function create_main_fragment(component, ctx) {
p(changed, ctx) {
if (changed.foo) {
text.data = ctx.foo;
setData(text, ctx.foo);
}
},

4
test/js/samples/collapses-text-around-comments/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto, setData } from "svelte/shared.js";
function data() {
return { foo: 42 }
@ -29,7 +29,7 @@ function create_main_fragment(component, ctx) {
p(changed, ctx) {
if (changed.foo) {
text.data = ctx.foo;
setData(text, ctx.foo);
}
},

6
test/js/samples/deconflict-builtins/expected-bundle.js
Unescape View File

@ -35,6 +35,10 @@ function createComment() {
return document.createComment('');
}
function setData(text, data) {
text.data = '' + data;
}
function blankObject() {
return Object.create(null);
}
@ -228,7 +232,7 @@ function create_each_block(component, ctx) {
p(changed, ctx) {
if ((changed.createElement) && text_value !== (text_value = ctx.node)) {
text.data = text_value;
setData(text, text_value);
}
},

4
test/js/samples/deconflict-builtins/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, proto } from "svelte/shared.js";
import { appendNode, assign, createComment, createElement, createText, destroyEach, detachNode, init, insertNode, proto, setData } from "svelte/shared.js";
function create_main_fragment(component, ctx) {
var each_anchor;
@ -79,7 +79,7 @@ function create_each_block(component, ctx) {
p(changed, ctx) {
if ((changed.createElement) && text_value !== (text_value = ctx.node)) {
text.data = text_value;
setData(text, text_value);
}
},

8
test/js/samples/dev-warning-missing-data-computed/expected-bundle.js
Unescape View File

@ -31,6 +31,10 @@ function createText(data) {
return document.createTextNode(data);
}
function setData(text, data) {
text.data = '' + data;
}
function blankObject() {
return Object.create(null);
}
@ -191,11 +195,11 @@ function create_main_fragment(component, ctx) {
p: function update(changed, ctx) {
if ((changed.Math || changed.foo) && text_value !== (text_value = ctx.Math.max(0, ctx.foo))) {
text.data = text_value;
setData(text, text_value);
}
if (changed.bar) {
text_2.data = ctx.bar;
setData(text_2, ctx.bar);
}
},

6
test/js/samples/dev-warning-missing-data-computed/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { addLoc, appendNode, assign, createElement, createText, detachNode, init, insertNode, protoDev } from "svelte/shared.js";
import { addLoc, appendNode, assign, createElement, createText, detachNode, init, insertNode, protoDev, setData } from "svelte/shared.js";
function bar({ foo }) {
return foo * 2;
@ -28,11 +28,11 @@ function create_main_fragment(component, ctx) {
p: function update(changed, ctx) {
if ((changed.Math || changed.foo) && text_value !== (text_value = ctx.Math.max(0, ctx.foo))) {
text.data = text_value;
setData(text, text_value);
}
if (changed.bar) {
text_2.data = ctx.bar;
setData(text_2, ctx.bar);
}
},

10
test/js/samples/each-block-changed-check/expected-bundle.js
Unescape View File

@ -37,6 +37,10 @@ function createText(data) {
return document.createTextNode(data);
}
function setData(text, data) {
text.data = '' + data;
}
function blankObject() {
return Object.create(null);
}
@ -207,7 +211,7 @@ function create_main_fragment(component, ctx) {
}
if (changed.foo) {
text_1.data = ctx.foo;
setData(text_1, ctx.foo);
}
},
@ -260,11 +264,11 @@ function create_each_block(component, ctx) {
p(changed, ctx) {
if ((changed.comments) && text_2_value !== (text_2_value = ctx.comment.author)) {
text_2.data = text_2_value;
setData(text_2, text_2_value);
}
if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = ctx.elapsed(ctx.comment.time, ctx.time))) {
text_4.data = text_4_value;
setData(text_4, text_4_value);
}
if ((changed.comments) && raw_value !== (raw_value = ctx.comment.html)) {

8
test/js/samples/each-block-changed-check/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, proto } from "svelte/shared.js";
import { appendNode, assign, createElement, createText, destroyEach, detachAfter, detachNode, init, insertNode, proto, setData } from "svelte/shared.js";
function create_main_fragment(component, ctx) {
var text, p, text_1;
@ -56,7 +56,7 @@ function create_main_fragment(component, ctx) {
}
if (changed.foo) {
text_1.data = ctx.foo;
setData(text_1, ctx.foo);
}
},
@ -109,11 +109,11 @@ function create_each_block(component, ctx) {
p(changed, ctx) {
if ((changed.comments) && text_2_value !== (text_2_value = ctx.comment.author)) {
text_2.data = text_2_value;
setData(text_2, text_2_value);
}
if ((changed.elapsed || changed.comments || changed.time) && text_4_value !== (text_4_value = ctx.elapsed(ctx.comment.time, ctx.time))) {
text_4.data = text_4_value;
setData(text_4, text_4_value);
}
if ((changed.comments) && raw_value !== (raw_value = ctx.comment.html)) {

6
test/js/samples/each-block-keyed-animated/expected-bundle.js
Unescape View File

@ -29,6 +29,10 @@ function createComment() {
return document.createComment('');
}
function setData(text, data) {
text.data = '' + data;
}
function linear(t) {
return t;
}
@ -533,7 +537,7 @@ function create_each_block(component, key_1, ctx) {
p(changed, ctx) {
if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
text.data = text_value;
setData(text, text_value);
}
},

4
test/js/samples/each-block-keyed-animated/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, blankObject, createComment, createElement, createText, detachNode, fixAndOutroAndDestroyBlock, fixPosition, init, insertNode, proto, updateKeyedEach, wrapAnimation } from "svelte/shared.js";
import { appendNode, assign, blankObject, createComment, createElement, createText, detachNode, fixAndOutroAndDestroyBlock, fixPosition, init, insertNode, proto, setData, updateKeyedEach, wrapAnimation } from "svelte/shared.js";
function foo(node, animation, params) {
const dx = animation.from.left - animation.to.left;
@ -80,7 +80,7 @@ function create_each_block(component, key_1, ctx) {
p(changed, ctx) {
if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
text.data = text_value;
setData(text, text_value);
}
},

6
test/js/samples/each-block-keyed/expected-bundle.js
Unescape View File

@ -29,6 +29,10 @@ function createComment() {
return document.createComment('');
}
function setData(text, data) {
text.data = '' + data;
}
function destroyBlock(block, lookup) {
block.d(1);
lookup[block.key] = null;
@ -298,7 +302,7 @@ function create_each_block(component, key_1, ctx) {
p(changed, ctx) {
if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
text.data = text_value;
setData(text, text_value);
}
},

4
test/js/samples/each-block-keyed/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, blankObject, createComment, createElement, createText, destroyBlock, detachNode, init, insertNode, proto, updateKeyedEach } from "svelte/shared.js";
import { appendNode, assign, blankObject, createComment, createElement, createText, destroyBlock, detachNode, init, insertNode, proto, setData, updateKeyedEach } from "svelte/shared.js";
function create_main_fragment(component, ctx) {
var each_blocks_1 = [], each_lookup = blankObject(), each_anchor;
@ -64,7 +64,7 @@ function create_each_block(component, key_1, ctx) {
p(changed, ctx) {
if ((changed.things) && text_value !== (text_value = ctx.thing.name)) {
text.data = text_value;
setData(text, text_value);
}
},

6
test/js/samples/window-binding-scroll/expected-bundle.js
Unescape View File

@ -25,6 +25,10 @@ function createText(data) {
return document.createTextNode(data);
}
function setData(text, data) {
text.data = '' + data;
}
function blankObject() {
return Object.create(null);
}
@ -178,7 +182,7 @@ function create_main_fragment(component, ctx) {
p(changed, ctx) {
if (changed.y) {
text_1.data = ctx.y;
setData(text_1, ctx.y);
}
},

4
test/js/samples/window-binding-scroll/expected.js
Unescape View File

@ -1,5 +1,5 @@
/* generated by Svelte vX.Y.Z */
import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto } from "svelte/shared.js";
import { appendNode, assign, createElement, createText, detachNode, init, insertNode, proto, setData } from "svelte/shared.js";
function create_main_fragment(component, ctx) {
var window_updating = false, clear_window_updating = function() { window_updating = false; }, window_updating_timeout, p, text, text_1;
@ -39,7 +39,7 @@ function create_main_fragment(component, ctx) {
p(changed, ctx) {
if (changed.y) {
text_1.data = ctx.y;
setData(text_1, ctx.y);
}
},

13
test/runtime/samples/set-null-text-node/_config.js
Unescape View File

@ -0,0 +1,13 @@
export default {
data: { foo: null },
html: 'foo is null',
test(assert, component, target) {
component.set({ foo: 42 });
assert.htmlEqual(target.innerHTML, 'foo is 42');
component.set({ foo: null });
assert.htmlEqual(target.innerHTML, 'foo is null');
}
};

1
test/runtime/samples/set-null-text-node/main.html
Unescape View File

@ -0,0 +1 @@
foo is {foo}
Write Preview
Loading…
Cancel
Save