remove redundant component.destroy calls, rename others to $destroy

mocha.opts

@@ -1,2 +1 @@
---bail
 test/test.js

test/runtime/samples/binding-audio-currenttime-duration-volume/_config.js

@@ -27,6 +27,5 @@ export default {
 		assert.equal(component.d, 0); // not 20, because read-only. Not sure how to test this!
 		assert.equal(component.v, 0.75);
 		assert.equal(component.paused, true); // ditto...
-		component.destroy();
 	}
 };

test/runtime/samples/binding-input-with-event/_config.js

@@ -14,7 +14,5 @@ export default {
 
 		assert.equal(input.value, '43');
 		assert.equal(component.a, 43);
-
-		component.destroy();
 	}
 };

test/runtime/samples/binding-select-initial-value-undefined/_config.js

@@ -19,7 +19,5 @@ export default {
 
 		assert.equal(select.value, 'a');
 		assert.ok(options[0].selected);
-
-		component.destroy();
 	}
 };

test/runtime/samples/binding-select-initial-value/_config.js

@@ -33,7 +33,5 @@ export default {
 
 		assert.equal(select.value, 'b');
 		assert.ok(options[1].selected);
-
-		component.destroy();
 	},
 };

test/runtime/samples/binding-select-late/_config.js

@@ -26,7 +26,5 @@ export default {
 			</select>
 			<p>selected: two</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/component-binding-deep-b/_config.js

@@ -78,7 +78,5 @@ export default {
 
 			<pre>ONE SOURCE CHANGED\nTWO SOURCE CHANGED</pre>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/component-binding-each-nested/_config.js

@@ -23,7 +23,5 @@ export default {
 			<input><input><input>
 			<p>blah, bar, baz</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/component-binding-each-object/_config.js

@@ -16,7 +16,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<span>yep</span><span>nope</span>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/component-binding-each/_config.js

@@ -23,7 +23,5 @@ export default {
 			<input><input><input>
 			<p>blah, bar, baz</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/component-yield-multiple-in-if/_config.js

@@ -6,7 +6,5 @@ export default {
 	test(assert, component, target) {
 		component.arriving = false;
 		assert.htmlEqual(target.innerHTML, `<div><p class='widget'>Goodbye</p></div>`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/computed-values-function-dependency/_config.js

@@ -5,6 +5,5 @@ export default {
 		component.y = 2;
 		assert.equal(component.x, 4);
 		assert.equal(target.innerHTML, '<p>4</p>');
-		component.destroy();
 	}
 };

test/runtime/samples/computed-values/_config.js

@@ -6,6 +6,5 @@ export default {
 		assert.equal(component.c, 5);
 		assert.equal(component.cSquared, 25);
 		assert.equal(target.innerHTML, '<p>3 + 2 = 5</p>\n<p>5 * 5 = 25</p>');
-		component.destroy();
 	}
 };

test/runtime/samples/deconflict-builtins/_config.js

@@ -3,6 +3,5 @@ export default {
 
 	test(assert, component) {
 		assert.equal(component.foo, 'got');
-		component.destroy();
 	}
 };

test/runtime/samples/deconflict-non-helpers/_config.js

@@ -3,6 +3,5 @@ export default {
 
 	test (assert, component) {
 		assert.equal(component.compute, 'ABCD');
-		component.destroy();
 	}
 };

test/runtime/samples/destroy-twice/_config.js

@@ -1,6 +1,6 @@
 export default {
 	test(assert, component) {
-		component.destroy();
+		component.$destroy();
-		component.destroy();
+		component.$destroy();
 	}
 };

test/runtime/samples/dev-warning-destroy-twice/_config.js

@@ -11,8 +11,8 @@ export default {
 			warnings.push(warning);
 		};
 
-		component.destroy();
+		component.$destroy();
-		component.destroy();
+		component.$destroy();
 
 		assert.deepEqual(warnings, [
 			`Component was already destroyed`

test/runtime/samples/each-block-keyed-dynamic/_config.js

@@ -27,7 +27,5 @@ export default {
 
 		assert.equal(p1, p3);
 		assert.equal(p2, p4);
-
-		component.destroy();
 	}
 };

test/runtime/samples/each-block-keyed-unshift/_config.js

@@ -16,7 +16,5 @@ export default {
 			<p>b</p>
 			<p>c</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/each-block-keyed/_config.js

@@ -23,7 +23,5 @@ export default {
 
 		assert.ok(!target.contains(p1), 'first <p> element should be removed');
 		assert.equal(p2, p3, 'second <p> element should be retained');
-
-		component.destroy();
 	}
 };

test/runtime/samples/event-handler-custom-each-destructured/_config.js

@@ -26,7 +26,5 @@ export default {
 
 		assert.equal(component.first, '1');
 		assert.equal(component.second, 'bar');
-
-		component.destroy();
 	}
 };

test/runtime/samples/event-handler-custom-each/_config.js

@@ -26,7 +26,5 @@ export default {
 
 		assert.equal(component.fromDom, 'bar');
 		assert.equal(component.fromState, 'bar');
-
-		component.destroy();
 	}
 };

test/runtime/samples/event-handler-each-deconflicted/_config.js

@@ -30,7 +30,5 @@ export default {
 			<button>bar</button>
 			<p>clicked: bar</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/event-handler-each/_config.js

@@ -26,7 +26,5 @@ export default {
 			<button>baz</button>
 			<p>selected: bar</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/event-handler-this-methods/main.html

@@ -1,2 +1,2 @@
 <input class='wont-focus'>
-<input class='will-focus' on:click='{() => event.target.focus()}'>
+<input class='will-focus' on:click='{e => e.target.focus()}'>

test/runtime/samples/events-custom/_config.js

@@ -11,7 +11,5 @@ export default {
 
 		component.fire('foo', expected);
 		assert.equal(count, 1);
-
-		component.destroy();
 	}
 };

test/runtime/samples/function-in-expression/_config.js

@@ -9,7 +9,5 @@ export default {
 		component.numbers = [10, 11, 12, 13, 14, 15, 16];
 
 		assert.htmlEqual(target.innerHTML, `11, 13, 15`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/get-after-destroy/_config.js

@@ -6,7 +6,7 @@ export default {
 	html: `<div>1</div>`,
 
 	test(assert, component) {
-		component.destroy();
+		component.$destroy();
 		const { foo } = component.get();
 		assert.equal(foo, undefined);
 	}

test/runtime/samples/hello-world/_config.js

@@ -9,7 +9,7 @@ export default {
 		component.name = 'everybody';
 		assert.htmlEqual(target.innerHTML, '<h1>Hello everybody!</h1>');
 
-		component.destroy();
+		component.$destroy();
 		assert.htmlEqual(target.innerHTML, '');
 	}
 };

test/runtime/samples/if-block-elseif-no-else/_config.js

@@ -15,7 +15,5 @@ export default {
 
 		component.x = 6;
 		assert.htmlEqual(target.innerHTML, ``);
-
-		component.destroy();
 	}
 };

test/runtime/samples/if-block-elseif-text/_config.js

@@ -17,7 +17,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			before-else-after
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/if-block-elseif/_config.js

@@ -17,7 +17,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<p>x is between 5 and 10</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/lifecycle-events/_config.js

@@ -1,7 +1,7 @@
 export default {
 	test(assert, component) {
 		assert.deepEqual(component.events, ['create']);
-		component.destroy();
+		component.$destroy();
 		assert.deepEqual(component.events, ['create', 'destroy']);
 	}
 };

test/runtime/samples/observe-deferred/_config.js

@@ -16,7 +16,5 @@ export default {
 			<p>goodbye!</p>
 			<p>goodbye!</p>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/onrender-chain/_config.js

@@ -11,7 +11,5 @@ export default {
 		assert.htmlEqual(target.innerHTML, `
 			<span>1</span><span>2</span><span>3</span><span>4</span><span>5</span>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/onrender-fires-when-ready/_config.js

@@ -6,7 +6,5 @@ export default {
 	test(assert, component, target) {
 		component.foo = true;
 		assert.htmlEqual(target.innerHTML, `<div><p>true</p>\n<p>true</p></div>`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/raw-mustaches-preserved/_config.js

@@ -13,7 +13,5 @@ export default {
 		component.raw = '<p>does not change</p>';
 		assert.equal(target.innerHTML, `<div><p>does not change</p></div>`);
 		assert.strictEqual(target.querySelector('p'), p);
-
-		component.destroy();
 	}
 };

test/runtime/samples/raw-mustaches/_config.js

@@ -14,7 +14,7 @@ export default {
 		assert.equal(target.innerHTML, `before${ns}${ns}after`);
 		component.raw = 'how about <strong>unclosed elements?';
 		assert.equal(target.innerHTML, `before${ns}how about <strong>unclosed elements?</strong>${ns}after`);
-		component.destroy();
+		component.$destroy();
 		assert.equal(target.innerHTML, '');
 	}
 };

test/runtime/samples/select-change-handler/_config.js

@@ -16,7 +16,5 @@ export default {
 		assert.equal(select.value, 'c');
 		assert.equal(component.lastChangedTo, 'c');
 		assert.equal(component.selected, 'c');
-
-		component.destroy();
 	}
 };

test/runtime/samples/select/_config.js

@@ -25,7 +25,7 @@ export default {
 
 		assert.equal(target.querySelector('select').value, 'a');
 
-		component.destroy();
+		component.$destroy();
 		assert.htmlEqual(target.innerHTML, '');
 	}
 };

test/runtime/samples/set-after-destroy/_config.js

@@ -4,7 +4,7 @@ export default {
 	},
 
 	test(assert, component) {
-		component.destroy();
+		component.$destroy();
 		component.x = 2;
 	}
 };

test/runtime/samples/set-clones-input/_config.js

@@ -11,6 +11,5 @@ export default {
 		const obj = { a: 1 };
 		component.set(obj);
 		component.set(obj); // will fail if the object is not cloned
-		component.destroy();
 	}
 };

test/runtime/samples/set-in-ondestroy/_config.js

@@ -18,7 +18,7 @@ export default {
 			values.push(current.foo);
 		});
 
-		component.destroy();
+		component.$destroy();
 
 		assert.deepEqual(values, [2]);
 		assert.equal(valueOnDestroy, 2);

test/runtime/samples/set-in-onstate-dedupes-renders/_config.js

@@ -3,6 +3,5 @@ export default {
 
 	test(assert, component) {
 		component.foo = { x: 2 };
-		component.destroy();
 	}
 };

test/runtime/samples/svg-attributes/_config.js

@@ -10,6 +10,5 @@ export default {
 	test(assert, component, target) {
 		const circle = target.querySelector('circle');
 		assert.equal(circle.getAttribute('class'), 'red');
-		component.destroy();
 	}
 };

test/runtime/samples/svg-class/_config.js

@@ -8,7 +8,5 @@ export default {
 
 		assert.equal(svg.namespaceURI, 'http://www.w3.org/2000/svg');
 		assert.equal(svg.getAttribute('class'), 'foo');
-
-		component.destroy();
 	}
 };

test/runtime/samples/svg-each-block-namespace/_config.js

@@ -10,6 +10,5 @@ export default {
 		assert.equal(circles[0].namespaceURI, 'http://www.w3.org/2000/svg');
 		assert.equal(circles[1].namespaceURI, 'http://www.w3.org/2000/svg');
 		assert.equal(circles[2].namespaceURI, 'http://www.w3.org/2000/svg');
-		component.destroy();
 	}
 };

test/runtime/samples/svg-xlink/_config.js

@@ -13,7 +13,5 @@ export default {
 		const href = use.attributes[ 'xlink:href' ];
 
 		assert.equal(href.namespaceURI, 'http://www.w3.org/1999/xlink');
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-css-delay/_config.js

@@ -6,7 +6,5 @@ export default {
 
 		raf.tick(50);
 		assert.strictEqual(div.style.opacity, '');
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-delay-in-out/_config.js

@@ -18,7 +18,5 @@ export default {
 
 		raf.tick(300);
 		assert.equal(div.bar, 0);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-delay/_config.js

@@ -23,7 +23,5 @@ export default {
 
 		raf.tick(250);
 		assert.equal(div.foo, 0);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-destroyed-before-end/_config.js

@@ -12,7 +12,7 @@ export default {
 		raf.tick(50);
 		assert.equal(div.foo, 0.5);
 
-		component.destroy();
+		component.$destroy();
 
 		raf.tick(100);
 	},

test/runtime/samples/transition-js-dynamic-if-block-bidi/_config.js

@@ -32,7 +32,5 @@ export default {
 		assert.equal(div.foo, 1);
 
 		raf.tick(225);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-each-block-intro-outro/_config.js

@@ -37,7 +37,5 @@ export default {
 		assert.equal(divs[0].bar, 1);
 		assert.equal(divs[1].bar, 1);
 		assert.equal(divs[2].bar, 1);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-each-block-intro/_config.js

@@ -26,7 +26,5 @@ export default {
 		assert.equal(divs[1].foo, 0.75);
 		assert.equal(divs[2].foo, 0.75);
 		assert.equal(divs[3].foo, 0.25);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-each-block-keyed-intro/_config.js

@@ -41,7 +41,5 @@ export default {
 		assert.equal(divs[1].foo, 0.25);
 		assert.equal(divs[2].foo, 0.75);
 		assert.equal(divs[3].foo, 0.75);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-events/_config.js

@@ -29,7 +29,5 @@ export default {
 		raf.tick(250);
 		assert.deepEqual(component.intros.sort(), ['a', 'a', 'b', 'b', 'c', 'c', 'd', 'd']);
 		assert.equal(component.introCount, 4);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-bidi/_config.js

@@ -24,7 +24,5 @@ export default {
 		assert.equal(div.foo, 1);
 
 		raf.tick(900);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-in-each-block-bidi-2/_config.js

@@ -13,8 +13,6 @@ export default {
 	`,
 
 	test(assert, component, target, window, raf) {
-		const divs = target.querySelectorAll('div');
-
 		raf.tick(100);
 
 		component.threshold = 4;
@@ -26,7 +24,5 @@ export default {
 			<div>3</div>
 			<div>4</div>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-in-each-block-bidi-3/_config.js

@@ -31,7 +31,5 @@ export default {
 			<div>4</div>
 			<div>5</div>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-in-each-block-bidi/_config.js

@@ -39,7 +39,5 @@ export default {
 			<div>2</div>
 			<div>3</div>
 		`);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-intro-outro/_config.js

@@ -40,7 +40,5 @@ export default {
 		assert.equal(div.bar, 0.5);
 
 		raf.tick(2000);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-intro/_config.js

@@ -11,7 +11,5 @@ export default {
 		assert.equal(window.getComputedStyle(div).opacity, 1);
 
 		raf.tick(500);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-block-outro-timeout/_config.js

@@ -16,7 +16,5 @@ export default {
 		raf.tick(600);
 		assert.equal(component.refs.div, undefined);
 		assert.equal(target.querySelector('div'), undefined);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-else-block-dynamic-outro/_config.js

@@ -17,6 +17,5 @@ export default {
 		assert.equal(component.refs.no.foo, 0.25);
 
 		raf.tick(100);
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-else-block-intro/_config.js

@@ -15,7 +15,5 @@ export default {
 		assert.equal(component.refs.yes.foo, 0.5);
 
 		raf.tick(1000);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-else-block-outro/_config.js

@@ -13,6 +13,5 @@ export default {
 		assert.equal(component.refs.no.foo, 0.25);
 
 		raf.tick(100);
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-if-elseif-block-outro/_config.js

@@ -19,6 +19,5 @@ export default {
 		assert.equal(component.refs.no.foo, 0.25);
 
 		raf.tick(100);
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-nested-intro/_config.js

@@ -15,7 +15,5 @@ export default {
 
 		raf.tick(150);
 		assert.equal(div.foo, 1);
-
-		component.destroy();
 	}
 };

test/runtime/samples/transition-js-parameterised-with-state/_config.js

@@ -15,7 +15,5 @@ export default {
 		assert.equal(div.foo, 200);
 
 		raf.tick(101);
-
-		component.destroy();
 	},
 };

test/runtime/samples/transition-js-parameterised/_config.js

@@ -11,7 +11,5 @@ export default {
 		assert.equal(div.foo, 200);
 
 		raf.tick(101);
-
-		component.destroy();
 	},
 };

test/runtime/samples/window-bind-scroll-update/_config.js

@@ -6,7 +6,5 @@ export default {
 
 		component.scrollY = 100;
 		assert.equal(window.pageYOffset, 100);
-
-		component.destroy();
 	}
 };

test/runtime/samples/window-event-context/_config.js

@@ -18,7 +18,5 @@ export default {
 		window.dispatchEvent(event);
 		assert.equal(component.foo, true);
 		assert.htmlEqual(target.innerHTML, `true`);
-
-		component.destroy();
 	}
 };