From e5ae97b9c9fbde4879352ddb50ba7f4cd16238d4 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sat, 15 Dec 2018 17:45:17 -0500 Subject: [PATCH] use helper for combining window binding props --- src/compile/render-dom/wrappers/Window.ts | 5 ++--- test/js/samples/action/expected.js | 2 +- test/js/samples/window-binding-scroll/expected.js | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/compile/render-dom/wrappers/Window.ts b/src/compile/render-dom/wrappers/Window.ts index a7f3b9c79f..05ab485256 100644 --- a/src/compile/render-dom/wrappers/Window.ts +++ b/src/compile/render-dom/wrappers/Window.ts @@ -3,6 +3,7 @@ import Block from '../Block'; import Node from '../../nodes/shared/Node'; import Wrapper from './shared/Wrapper'; import deindent from '../../../utils/deindent'; +import stringifyProps from '../../../utils/stringifyProps'; const associatedEvents = { innerWidth: 'resize', @@ -147,9 +148,7 @@ export default class WindowWrapper extends Wrapper { `} ${component.options.dev && `component._updatingReadonlyProperty = true;`} - #component.set({ - ${props.map(prop => `${prop.name}: this.${prop.value},`)} - }); + #component.set(${stringifyProps(props.map(prop => `${prop.name}: this.${prop.value}`))}); ${component.options.dev && `component._updatingReadonlyProperty = false;`} ${event === 'scroll' && `${lock} = false;`} diff --git a/test/js/samples/action/expected.js b/test/js/samples/action/expected.js index 83a668acd5..eac96a80c5 100644 --- a/test/js/samples/action/expected.js +++ b/test/js/samples/action/expected.js @@ -2,7 +2,7 @@ import { assign, createElement, detachNode, init, insert, noop, proto } from "svelte/shared.js"; function link(node) { - + function onClick(event) { event.preventDefault(); history.pushState(null, null, event.target.href); diff --git a/test/js/samples/window-binding-scroll/expected.js b/test/js/samples/window-binding-scroll/expected.js index 6fc66443b9..671550a27d 100644 --- a/test/js/samples/window-binding-scroll/expected.js +++ b/test/js/samples/window-binding-scroll/expected.js @@ -8,9 +8,7 @@ function create_main_fragment(component, ctx) { if (window_updating) return; window_updating = true; - component.set({ - y: this.pageYOffset - }); + component.set({ y: this.pageYOffset }); window_updating = false; } window.addEventListener("scroll", onwindowscroll);