From 5dd44ea731bfed99198ef40a2106c34a5fb17773 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 23 Sep 2018 15:02:56 -0400 Subject: [PATCH] almost all tests passing --- .../render-dom/wrappers/Element/Attribute.ts | 2 +- test/js/index.js | 2 +- .../expected-bundle.js | 24 +++++++++---------- .../inline-style-unoptimized/expected.js | 24 +++++++++---------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/compile/render-dom/wrappers/Element/Attribute.ts b/src/compile/render-dom/wrappers/Element/Attribute.ts index 0dbcac4564..2d52b6dd7d 100644 --- a/src/compile/render-dom/wrappers/Element/Attribute.ts +++ b/src/compile/render-dom/wrappers/Element/Attribute.ts @@ -99,7 +99,7 @@ export default class AttributeWrapper { const isSelectValueAttribute = name === 'value' && element.node.name === 'select'; - const shouldCache = this.shouldCache || isSelectValueAttribute; + const shouldCache = this.node.shouldCache || isSelectValueAttribute; const last = shouldCache && block.getUniqueName( `${element.var}_${name.replace(/[^a-zA-Z_$]/g, '_')}_value` diff --git a/test/js/index.js b/test/js/index.js index 28d40c0740..8c6104fa37 100644 --- a/test/js/index.js +++ b/test/js/index.js @@ -4,7 +4,7 @@ import * as path from "path"; import { rollup } from "rollup"; import { loadConfig, svelte } from "../helpers.js"; -describe.only("js", () => { +describe("js", () => { fs.readdirSync("test/js/samples").forEach(dir => { if (dir[0] === ".") return; diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js index ff6bfc0705..1f0161a616 100644 --- a/test/js/samples/inline-style-unoptimized/expected-bundle.js +++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js @@ -157,38 +157,38 @@ var proto = { /* generated by Svelte vX.Y.Z */ function create_main_fragment(component, ctx) { - var div, text, div_1, div_1_style_value; + var div0, text, div1, div1_style_value; return { c() { - div = createElement("div"); + div0 = createElement("div"); text = createText("\n"); - div_1 = createElement("div"); - div.style.cssText = ctx.style; - div_1.style.cssText = div_1_style_value = "" + ctx.key + ": " + ctx.value; + div1 = createElement("div"); + div0.style.cssText = ctx.style; + div1.style.cssText = div1_style_value = "" + ctx.key + ": " + ctx.value; }, m(target, anchor) { - insert(target, div, anchor); + insert(target, div0, anchor); insert(target, text, anchor); - insert(target, div_1, anchor); + insert(target, div1, anchor); }, p(changed, ctx) { if (changed.style) { - div.style.cssText = ctx.style; + div0.style.cssText = ctx.style; } - if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + ctx.key + ": " + ctx.value)) { - div_1.style.cssText = div_1_style_value; + if ((changed.key || changed.value) && div1_style_value !== (div1_style_value = "" + ctx.key + ": " + ctx.value)) { + div1.style.cssText = div1_style_value; } }, d(detach) { if (detach) { - detachNode(div); + detachNode(div0); detachNode(text); - detachNode(div_1); + detachNode(div1); } } }; diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js index 88f242f3ae..fd7ba41033 100644 --- a/test/js/samples/inline-style-unoptimized/expected.js +++ b/test/js/samples/inline-style-unoptimized/expected.js @@ -2,38 +2,38 @@ import { assign, createElement, createText, detachNode, init, insert, proto } from "svelte/shared.js"; function create_main_fragment(component, ctx) { - var div, text, div_1, div_1_style_value; + var div0, text, div1, div1_style_value; return { c() { - div = createElement("div"); + div0 = createElement("div"); text = createText("\n"); - div_1 = createElement("div"); - div.style.cssText = ctx.style; - div_1.style.cssText = div_1_style_value = "" + ctx.key + ": " + ctx.value; + div1 = createElement("div"); + div0.style.cssText = ctx.style; + div1.style.cssText = div1_style_value = "" + ctx.key + ": " + ctx.value; }, m(target, anchor) { - insert(target, div, anchor); + insert(target, div0, anchor); insert(target, text, anchor); - insert(target, div_1, anchor); + insert(target, div1, anchor); }, p(changed, ctx) { if (changed.style) { - div.style.cssText = ctx.style; + div0.style.cssText = ctx.style; } - if ((changed.key || changed.value) && div_1_style_value !== (div_1_style_value = "" + ctx.key + ": " + ctx.value)) { - div_1.style.cssText = div_1_style_value; + if ((changed.key || changed.value) && div1_style_value !== (div1_style_value = "" + ctx.key + ": " + ctx.value)) { + div1.style.cssText = div1_style_value; } }, d(detach) { if (detach) { - detachNode(div); + detachNode(div0); detachNode(text); - detachNode(div_1); + detachNode(div1); } } };