Skip to content

Commit

Permalink
merge master -> gh-1678
Browse files Browse the repository at this point in the history
  • Loading branch information
Rich-Harris committed Sep 19, 2018
2 parents cf5e039 + d219da3 commit 2dce34c
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/compile/render-dom/wrappers/Element/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ export default class ElementWrapper extends Wrapper {
dependencies = expression.dependencies;
} else {
snippet = `ctx${quotePropIfNecessary(name)}`;
dependencies = [name];
dependencies = new Set([name]);
}
const updater = `@toggleClass(${this.var}, "${name}", ${snippet});`;

Expand Down
16 changes: 16 additions & 0 deletions test/runtime/samples/class-shortcut-with-class/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
export default {
data: {
"is-active": true,
isSelected: true,
myClass: 'one two'
},
html: `<div class="one two is-active isSelected"></div>`,

test ( assert, component, target, window ) {
component.set({ "is-active": false });

assert.htmlEqual( target.innerHTML, `
<div class="one two isSelected"></div>
` );
}
};
1 change: 1 addition & 0 deletions test/runtime/samples/class-shortcut-with-class/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>
7 changes: 3 additions & 4 deletions test/runtime/samples/class-shortcut/_config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
export default {
data: {
"is-active": true,
isSelected: true,
myClass: 'one two'
isSelected: true
},
html: `<div class="one two is-active isSelected"></div>`,
html: `<div class="is-active isSelected"></div>`,

test ( assert, component, target, window ) {
component.set({ "is-active": false });

assert.htmlEqual( target.innerHTML, `
<div class="one two isSelected"></div>
<div class="isSelected"></div>
` );
}
};
2 changes: 1 addition & 1 deletion test/runtime/samples/class-shortcut/main.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="{ myClass }" class:is-active class:isSelected class:not-used></div>
<div class:is-active class:isSelected class:not-used></div>

0 comments on commit 2dce34c

Please sign in to comment.