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

Merge inject when extending a component #5827

Merged
merged 9 commits into from
Jun 15, 2017
Merged

Merge inject when extending a component #5827

merged 9 commits into from
Jun 15, 2017

Commits on Jun 5, 2017

  1. simply fix inject extends

    @jkzing
    jkzing committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    1c4439e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' of github.com:vuejs/vue into extend-inject

    @jkzing
    jkzing committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    5ff35a4 View commit details
    Browse the repository at this point in the history

  3. add comments for normalizeInject

    @jkzing
    jkzing committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    bfda503 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. normalizeInect should return for non-array

    @jkzing
    jkzing committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    574162e View commit details
    Browse the repository at this point in the history

  2. remove isArray branch in resolveInject

    @jkzing
    jkzing committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    01db8fe View commit details
    Browse the repository at this point in the history

  3. add test case for extending injection

    @jkzing
    jkzing committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    7a13fd6 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Create options.js

    @yyx990803
    yyx990803 committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    2e35046 View commit details
    Browse the repository at this point in the history

  2. type of inject should be object now

    @jkzing
    jkzing committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    8466a28 View commit details
    Browse the repository at this point in the history

  3. Revert "type of inject should be object now" 

    This reverts commit 8466a28.
    @jkzing
    jkzing committed Jun 15, 2017
    Configuration menu
    Copy the full SHA
    a4fade5 View commit details
    Browse the repository at this point in the history