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

feat: support client.await #7

Merged
merged 4 commits into from
Feb 17, 2017
Merged

feat: support client.await #7

merged 4 commits into from
Feb 17, 2017

Conversation

dead-horse
Copy link
Member

No description provided.

@mention-bot
Copy link

@dead-horse, thanks for your PR! By analyzing the history of the files in this pull request, we identified @gxcsoccer and @fengmk2 to be potential reviewers.

@codecov
Copy link

codecov bot commented Feb 16, 2017

Codecov Report

Merging #7 into master will not change coverage.
The diff coverage is 100%.

@@          Coverage Diff          @@
##           master     #7   +/-   ##
=====================================
  Coverage     100%   100%           
=====================================
  Files           1      1           
  Lines          73     75    +2     
=====================================
+ Hits           73     75    +2
Impacted Files Coverage Δ
index.js 100% <100%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3da003...57a8017. Read the comment docs.

@leoner
Copy link

leoner commented Feb 17, 2017

image

不合并下?

@@ -77,50 +77,58 @@ co(function* () {

- `.ready(flagOrFunction)` flagOrFunction is optional, and the argument type can be Boolean, Error or Function.

```js
Copy link
Member

Choose a reason for hiding this comment

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

为啥把缩进去掉了

Copy link
Member

Choose a reason for hiding this comment

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

我还原

Copy link
Member Author

Choose a reason for hiding this comment

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

缩进没去掉,这个缩进多了一级。

@dead-horse
Copy link
Member Author

@leoner 合并 PR 的时候可以做合并的

Copy link
Member

@gxcsoccer gxcsoccer left a comment

Choose a reason for hiding this comment

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

+1

package.json Outdated
@@ -28,6 +28,7 @@
},
"license": "MIT",
"dependencies": {
"await-event": "^1.0.0",
Copy link
Member

Choose a reason for hiding this comment

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

我手动合并。

@fengmk2 fengmk2 merged commit 234ad3a into master Feb 17, 2017
@fengmk2 fengmk2 deleted the add-await-event branch February 17, 2017 05:53
@fengmk2
Copy link
Member

fengmk2 commented Feb 17, 2017

3.1.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants