From 28e3ecdb3ea61e3992405be6f9a1535441d2d2a7 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 15 Dec 2017 19:55:48 -0500 Subject: [PATCH] can just use options here --- src/shared/index.js | 2 +- .../samples/collapses-text-around-comments/expected-bundle.js | 2 +- test/js/samples/component-static/expected-bundle.js | 2 +- test/js/samples/computed-collapsed-if/expected-bundle.js | 2 +- test/js/samples/css-media-query/expected-bundle.js | 2 +- test/js/samples/css-shadow-dom-keyframes/expected-bundle.js | 2 +- test/js/samples/do-use-dataset/expected-bundle.js | 2 +- test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js | 2 +- test/js/samples/dont-use-dataset-in-svg/expected-bundle.js | 2 +- test/js/samples/each-block-changed-check/expected-bundle.js | 2 +- test/js/samples/event-handlers-custom/expected-bundle.js | 2 +- test/js/samples/if-block-no-update/expected-bundle.js | 2 +- test/js/samples/if-block-simple/expected-bundle.js | 2 +- .../samples/inline-style-optimized-multiple/expected-bundle.js | 2 +- test/js/samples/inline-style-optimized-url/expected-bundle.js | 2 +- test/js/samples/inline-style-optimized/expected-bundle.js | 2 +- test/js/samples/inline-style-unoptimized/expected-bundle.js | 2 +- test/js/samples/input-without-blowback-guard/expected-bundle.js | 2 +- test/js/samples/legacy-input-type/expected-bundle.js | 2 +- test/js/samples/legacy-quote-class/expected-bundle.js | 2 +- test/js/samples/media-bindings/expected-bundle.js | 2 +- test/js/samples/non-imported-component/expected-bundle.js | 2 +- .../js/samples/onrender-onteardown-rewritten/expected-bundle.js | 2 +- test/js/samples/setup-method/expected-bundle.js | 2 +- test/js/samples/use-elements-as-anchors/expected-bundle.js | 2 +- test/js/samples/window-binding-scroll/expected-bundle.js | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/shared/index.js b/src/shared/index.js index 7a33c73d29..3adae010c2 100644 --- a/src/shared/index.js +++ b/src/shared/index.js @@ -71,7 +71,7 @@ export function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } export function observe(key, callback, options) { diff --git a/test/js/samples/collapses-text-around-comments/expected-bundle.js b/test/js/samples/collapses-text-around-comments/expected-bundle.js index 9b965c9458..487665fe9d 100644 --- a/test/js/samples/collapses-text-around-comments/expected-bundle.js +++ b/test/js/samples/collapses-text-around-comments/expected-bundle.js @@ -97,7 +97,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/component-static/expected-bundle.js b/test/js/samples/component-static/expected-bundle.js index 9688eebfad..d304821c98 100644 --- a/test/js/samples/component-static/expected-bundle.js +++ b/test/js/samples/component-static/expected-bundle.js @@ -73,7 +73,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/computed-collapsed-if/expected-bundle.js b/test/js/samples/computed-collapsed-if/expected-bundle.js index 928635e6fc..1732dcf323 100644 --- a/test/js/samples/computed-collapsed-if/expected-bundle.js +++ b/test/js/samples/computed-collapsed-if/expected-bundle.js @@ -73,7 +73,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/css-media-query/expected-bundle.js b/test/js/samples/css-media-query/expected-bundle.js index af9a6237fb..0d653764f2 100644 --- a/test/js/samples/css-media-query/expected-bundle.js +++ b/test/js/samples/css-media-query/expected-bundle.js @@ -93,7 +93,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js index 511cc37772..c0b7861a63 100644 --- a/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js +++ b/test/js/samples/css-shadow-dom-keyframes/expected-bundle.js @@ -85,7 +85,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/do-use-dataset/expected-bundle.js b/test/js/samples/do-use-dataset/expected-bundle.js index 7f12d50f9d..b768840f2e 100644 --- a/test/js/samples/do-use-dataset/expected-bundle.js +++ b/test/js/samples/do-use-dataset/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js index e55f7bbb99..da13568e97 100644 --- a/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js @@ -93,7 +93,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js index 607125c9bd..ad53e6a274 100644 --- a/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js +++ b/test/js/samples/dont-use-dataset-in-svg/expected-bundle.js @@ -93,7 +93,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/each-block-changed-check/expected-bundle.js b/test/js/samples/each-block-changed-check/expected-bundle.js index fa26040cc3..90f3eeadef 100644 --- a/test/js/samples/each-block-changed-check/expected-bundle.js +++ b/test/js/samples/each-block-changed-check/expected-bundle.js @@ -105,7 +105,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/event-handlers-custom/expected-bundle.js b/test/js/samples/event-handlers-custom/expected-bundle.js index 7d2c297952..17943516aa 100644 --- a/test/js/samples/event-handlers-custom/expected-bundle.js +++ b/test/js/samples/event-handlers-custom/expected-bundle.js @@ -85,7 +85,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/if-block-no-update/expected-bundle.js b/test/js/samples/if-block-no-update/expected-bundle.js index 75a956d483..966081e9ed 100644 --- a/test/js/samples/if-block-no-update/expected-bundle.js +++ b/test/js/samples/if-block-no-update/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/if-block-simple/expected-bundle.js b/test/js/samples/if-block-simple/expected-bundle.js index b51d2a83e2..63fed6f4cf 100644 --- a/test/js/samples/if-block-simple/expected-bundle.js +++ b/test/js/samples/if-block-simple/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js index ff87d9ce83..53526770d7 100644 --- a/test/js/samples/inline-style-optimized-multiple/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-multiple/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js index 7cb79030a3..45848aad35 100644 --- a/test/js/samples/inline-style-optimized-url/expected-bundle.js +++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/inline-style-optimized/expected-bundle.js b/test/js/samples/inline-style-optimized/expected-bundle.js index 9a7c67303d..84e4f81567 100644 --- a/test/js/samples/inline-style-optimized/expected-bundle.js +++ b/test/js/samples/inline-style-optimized/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js index 34735ee707..5d04406716 100644 --- a/test/js/samples/inline-style-unoptimized/expected-bundle.js +++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js @@ -89,7 +89,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/input-without-blowback-guard/expected-bundle.js b/test/js/samples/input-without-blowback-guard/expected-bundle.js index 9d58e2e33e..22778e66cf 100644 --- a/test/js/samples/input-without-blowback-guard/expected-bundle.js +++ b/test/js/samples/input-without-blowback-guard/expected-bundle.js @@ -93,7 +93,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/legacy-input-type/expected-bundle.js b/test/js/samples/legacy-input-type/expected-bundle.js index e04c2d92ec..802dbfc100 100644 --- a/test/js/samples/legacy-input-type/expected-bundle.js +++ b/test/js/samples/legacy-input-type/expected-bundle.js @@ -91,7 +91,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/legacy-quote-class/expected-bundle.js b/test/js/samples/legacy-quote-class/expected-bundle.js index 866f1729e5..09b00d11ea 100644 --- a/test/js/samples/legacy-quote-class/expected-bundle.js +++ b/test/js/samples/legacy-quote-class/expected-bundle.js @@ -108,7 +108,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/media-bindings/expected-bundle.js b/test/js/samples/media-bindings/expected-bundle.js index 992eab5ab1..9394167dca 100644 --- a/test/js/samples/media-bindings/expected-bundle.js +++ b/test/js/samples/media-bindings/expected-bundle.js @@ -101,7 +101,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/non-imported-component/expected-bundle.js b/test/js/samples/non-imported-component/expected-bundle.js index af4e62db5b..9c14fc4a20 100644 --- a/test/js/samples/non-imported-component/expected-bundle.js +++ b/test/js/samples/non-imported-component/expected-bundle.js @@ -87,7 +87,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js index 1b5743bc56..c1af671858 100644 --- a/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js +++ b/test/js/samples/onrender-onteardown-rewritten/expected-bundle.js @@ -73,7 +73,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/setup-method/expected-bundle.js b/test/js/samples/setup-method/expected-bundle.js index 5597140eef..5e7b3ffc8b 100644 --- a/test/js/samples/setup-method/expected-bundle.js +++ b/test/js/samples/setup-method/expected-bundle.js @@ -73,7 +73,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/use-elements-as-anchors/expected-bundle.js b/test/js/samples/use-elements-as-anchors/expected-bundle.js index 0c52eb89f0..837a7e4275 100644 --- a/test/js/samples/use-elements-as-anchors/expected-bundle.js +++ b/test/js/samples/use-elements-as-anchors/expected-bundle.js @@ -97,7 +97,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) { diff --git a/test/js/samples/window-binding-scroll/expected-bundle.js b/test/js/samples/window-binding-scroll/expected-bundle.js index 7634347645..b3dbd98a57 100644 --- a/test/js/samples/window-binding-scroll/expected-bundle.js +++ b/test/js/samples/window-binding-scroll/expected-bundle.js @@ -93,7 +93,7 @@ function init(component, options) { component.options = options; component.root = options.root || component; - component.store = component.root.store || component.root.options.store; + component.store = component.root.store || options.store; } function observe(key, callback, options) {