Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #1188, fixes #1201 #1210

Merged
merged 11 commits into from
Mar 6, 2018
Merged

fixes #1188, fixes #1201 #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e2d5061
fixes #1188, fixes #1201
ekhaled Mar 6, 2018
2e3724f
fix snapshots
ekhaled Mar 6, 2018
7401004
add test for transitions on nested components
ekhaled Mar 6, 2018
7b22461
fix tests on linux
ekhaled Mar 6, 2018
ae86cf9
clarify in test that its an intro test only
ekhaled Mar 6, 2018
6792e77
some case-sensitivity thing
ekhaled Mar 6, 2018
6b886d6
move `|| null`
ekhaled Mar 6, 2018
270be98
fix bundle snapshots
ekhaled Mar 6, 2018
2e9cd47
fix snapshots for the actual mounting code
ekhaled Mar 6, 2018
b8beb00
remove file
ekhaled Mar 6, 2018
f9d606a
re-add Child.html
ekhaled Mar 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/generators/dom/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default function dom(
this._fragment.c();
this._fragment.${block.hasIntroMethod ? 'i' : 'm'}(this.shadowRoot, null);

if (options.target) this._mount(options.target, options.anchor || null);
if (options.target) this._mount(options.target, options.anchor);
` : deindent`
if (options.target) {
${generator.hydratable
Expand All @@ -280,7 +280,7 @@ export default function dom(
${options.dev && `if (options.hydrate) throw new Error("options.hydrate only works if the component was compiled with the \`hydratable: true\` option");`}
this._fragment.c();
`}
this._fragment.${block.hasIntroMethod ? 'i' : 'm'}(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

${(generator.hasComponents || generator.hasComplexBindings || templateProperties.oncreate || generator.hasIntroTransitions) && deindent`
${generator.hasComponents && `this._lock = true;`}
Expand Down
2 changes: 1 addition & 1 deletion src/shared/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ export function callAll(fns) {
}

export function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

export function _unmount() {
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/collapses-text-around-comments/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -252,7 +252,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/collapses-text-around-comments/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/component-static-immutable/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -219,7 +219,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/component-static-immutable/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/component-static-immutable2/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -219,7 +219,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/component-static-immutable2/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/component-static/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -215,7 +215,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/component-static/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

this._lock = true;
callAll(this._beforecreate);
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/computed-collapsed-if/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -203,7 +203,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/computed-collapsed-if/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/css-media-query/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -239,7 +239,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/css-media-query/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/css-shadow-dom-keyframes/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -221,7 +221,7 @@ class SvelteComponent extends HTMLElement {
this._fragment.c();
this._fragment.m(this.shadowRoot, null);

if (options.target) this._mount(options.target, options.anchor || null);
if (options.target) this._mount(options.target, options.anchor);
}

static get observedAttributes() {
Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/css-shadow-dom-keyframes/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SvelteComponent extends HTMLElement {
this._fragment.c();
this._fragment.m(this.shadowRoot, null);

if (options.target) this._mount(options.target, options.anchor || null);
if (options.target) this._mount(options.target, options.anchor);
}

static get observedAttributes() {
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/deconflict-globals/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -211,7 +211,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

callAll(this._oncreate);
}
Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/deconflict-globals/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);

callAll(this._oncreate);
}
Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/do-use-dataset/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -233,7 +233,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/do-use-dataset/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/dont-use-dataset-in-legacy/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -237,7 +237,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/dont-use-dataset-in-legacy/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/dont-use-dataset-in-svg/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -235,7 +235,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/dont-use-dataset-in-svg/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/each-block-changed-check/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -360,7 +360,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/each-block-changed-check/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/event-handlers-custom/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -233,7 +233,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/js/samples/event-handlers-custom/expected.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/js/samples/head-no-whitespace/expected-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function callAll(fns) {
}

function _mount(target, anchor) {
this._fragment.m(target, anchor);
this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
}

function _unmount() {
Expand Down Expand Up @@ -224,7 +224,7 @@ function SvelteComponent(options) {

if (options.target) {
this._fragment.c();
this._fragment.m(options.target, options.anchor || null);
this._mount(options.target, options.anchor);
}
}

Expand Down
Loading