Skip to content

Fix definitons #3591

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
Merged
merged 4 commits into from
Sep 5, 2016
Merged

Fix definitons #3591

merged 4 commits into from
Sep 5, 2016

Conversation

kaorun343
Copy link
Contributor

@kaorun343 kaorun343 commented Sep 2, 2016 •
edited
Loading

@kaorun343
Fix types
14d58d7 
* add “FunctionalComponentOptions” and “ContextObject”
* fix and update types
ktsn
ktsn reviewed Sep 2, 2016
View reviewed changes
types/options.d.ts
name?: string;
}

export interface ContextObject {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to rename this interface to more concrete name, like RenderContext?

@ktsn
Copy link
Member

ktsn commented Sep 2, 2016

@kaorun343 Thanks for your quick fix 😄

@yyx990803
Copy link
Member

Seems that there are conflicts after merging #3582 - can we resolve that?

@kaorun343
Copy link
Contributor Author

I will resolve that.

@yyx990803 yyx990803 merged commit 8f4aab2 into vuejs:next Sep 5, 2016
@kaorun343 kaorun343 deleted the fix-definitions branch September 5, 2016 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaorun343 @ktsn @yyx990803