Skip to content

Added missing method - #8947

Merged
vvakame merged 5 commits into
DefinitelyTyped:masterfrom
AbhishekGarg:ui-grid-type-definition-update
Jun 19, 2016
Merged

Added missing method#8947
vvakame merged 5 commits into
DefinitelyTyped:masterfrom
AbhishekGarg:ui-grid-type-definition-update

Conversation

@AbhishekGarg

@AbhishekGarg AbhishekGarg commented Apr 12, 2016

Copy link
Copy Markdown
Contributor

Added method refresh to IGridCoreApi

@AbhishekGarg
Added missing method
04b782d 
Added method refresh to IGridCoreApi
@AbhishekGarg
Merge pull request #1 from AbhishekGarg/ui-grid-definition-update
7a98bbf 
Added missing method
@AbhishekGarg
Revert "Merge pull request #1 from AbhishekGarg/ui-grid-definition-up…
da9307e 
…date"

This reverts commit 7a98bbf, reversing
changes made to 2712dd1.
@AbhishekGarg
Added missing method
9346a92 
Added method refresh to IGridCoreApi
@dt-bot

dt-bot commented Apr 12, 2016

Copy link
Copy Markdown
Member

ui-grid/ui-grid.d.ts

to authors (@btesser @joeskeen). Could you review this PR?
👍 or 👎?

Checklist

  • pass the Travis CI test?

@AbhishekGarg AbhishekGarg mentioned this pull request Apr 12, 2016
Closed
@AbhishekGarg
Added missing argument
ab12eb7 
Added argument row to function rowIdentity in IGridOptions
@AbhishekGarg

AbhishekGarg commented Apr 12, 2016

Copy link
Copy Markdown
Contributor Author

The commit ab12eb7 was added after this pull request, yet it was automatically added.
Can I do something in this regard? Or will merging the pull request merge both commits together?

PS: Sorry, don't know the details because I am a new user to Github.

@vvakame

vvakame commented Apr 12, 2016

Copy link
Copy Markdown
Member

don't mind. please wait for response from authors.

you should use other branch when you want to split pull request.

joeskeen
joeskeen reviewed Apr 12, 2016
View reviewed changes
Comment thread ui-grid/ui-grid.d.ts
* to generate one
*/
rowIdentity?(): any;
rowIdentity?(row: IGridRowOf<TEntity>): any;

@joeskeen joeskeen Apr 12, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This hunk looks good :)

@AbhishekGarg AbhishekGarg Apr 13, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Sorry for the confusion. Actually, this PR was for the refresh method, but I didn't know enough about Git and pushed this commit (ab12eb7) to the same branch.
Should I revert/drop this commit or will it be merged along with the other (9346a92)?

@joeskeen joeskeen Apr 13, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm fine leaving it here, unless @btesser-r7 objects.

@btesser-r7 btesser-r7 Apr 15, 2016

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

lgtm

@AbhishekGarg

AbhishekGarg commented Apr 13, 2016

Copy link
Copy Markdown
Contributor Author

@joeskeen Submitted PR #5315 to https://github.com/angular-ui/ui-grid/

@joeskeen joeskeen mentioned this pull request Apr 13, 2016
Merged
@vvakame

vvakame commented Apr 17, 2016 •
edited
Loading

Copy link
Copy Markdown
Member

👀 I merged #8966 first. Should I wait for ui-grid document update?

@AbhishekGarg

AbhishekGarg commented Jun 17, 2016

Copy link
Copy Markdown
Contributor Author

@joeskeen @vvakame ui-grid PR has been merged. Can we please merge and close this PR, and the issue.

@vvakame
vvakame merged commit 6ea0b79 into DefinitelyTyped:master Jun 19, 2016
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.

5 participants

@AbhishekGarg @dt-bot @vvakame @joeskeen @btesser-r7