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.

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

fix slot resolved incorrect with abstract component (fixed #5888) #5895

Merged
merged 1 commit into from
Jun 16, 2017

Conversation

Kingwl
Copy link
Member

@Kingwl Kingwl commented Jun 16, 2017

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change? (check one)

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)

Other information:

@yyx990803 yyx990803 merged commit 213f136 into vuejs:dev Jun 16, 2017
@Kingwl Kingwl deleted the slot-resolve branch June 17, 2017 01:52
awamwang added a commit to awamwang/vue that referenced this pull request Jun 28, 2017
* 'dev' of https://github.com/vuejs/vue:
  build: use cross-platform hook installation with shelljs
  build: move test config files into /test
  build: add script for generating release note
  build: add git commit message validation
  fix(v-model): use consistent behavior during IME composition for other text-like input types (fix vuejs#5902)
  simplify source with rest params
  fix slot resolved incorrect with abstract component (fix vuejs#5888) (vuejs#5895)
  test:improve reserved props test
  test:add bind object test
  fix:when using object syntax in v-bind, special attribute have no effect
  Be able to use string type index in array (vuejs#5889)
  Merge inject when extending a component (vuejs#5827)

# Conflicts:
#	.gitignore
#	src/core/util/options.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants