Support v-if multiple conditions #4271
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…feature # Conflicts: # src/compiler/optimizer.js
…feature # Conflicts: # src/compiler/parser/index.js
|
Latter might be better for non-native users |
zzz6519003
reviewed
Nov 22, 2016
| @@ -41,6 +41,7 @@ declare type ModuleOptions = { | |||
| } | |||
|
|
|||
| declare type ASTModifiers = { [key: string]: boolean } | |||
| declare type ASTIfConditions = Array<{ exp: ?string; block: ASTElement }> | |||
zzz6519003
reviewed
Nov 22, 2016
| else?: true; | ||
| elseBlock?: ASTElement; | ||
| conditions?: ASTIfConditions; |
zzz6519003
reviewed
Nov 22, 2016
| }).$mount() | ||
| expect(vm.$el.innerHTML.trim()).toBe('<span>hello</span>') | ||
| vm.foo = false | ||
| waitForUpdate(() => { |
zzz6519003
reviewed
Nov 22, 2016
| vm.bar = true | ||
| }).then(() => { | ||
| expect(vm.$el.innerHTML.trim()).toBe('<span>elseif</span>') | ||
| vm.bar = false |
There was a problem hiding this comment.
if it wants a then chaining,
+ expect(vm.$el.innerHTML.trim()).toBe('<span>elseif</span>')
+ vm.bar = falseshould return a promise,
but I see no promise T.T
zzz6519003
reviewed
Nov 22, 2016
| vm.bar = 0 | ||
| }).then(() => { | ||
| expect(vm.$el.innerHTML.trim()).toBe('<span>bye</span>') | ||
| vm.bar = [] |
There was a problem hiding this comment.
why would it be necessary for so many kind of vm.bar @fnlctrl
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Support v-if multiple conditions
Collects
ifandv-elseifandv-elseinto element.conditions when parsing and generates code like (a)?_h:(c)?_h:_e()