-
Notifications
You must be signed in to change notification settings - Fork 216
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
ES6 6.0 / Node v4.2.4+ Peer Review for v6.0.0 #73
Open
edwardhotchkiss
wants to merge
20
commits into
master
Choose a base branch
from
ES6-6.0
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
779dd55
[package, prep] prep version # for v6.0.0!
edwardhotchkiss cda8344
[travis, test] test starting on 4.2. reason being for "harmony"
edwardhotchkiss ff90322
[travis, test] added stable
edwardhotchkiss 0c7c89c
[test] remove console logs
edwardhotchkiss 9020404
[fix, error handling] catch error on promise => callback
edwardhotchkiss 67dc751
[promises] resolve result if no cb
edwardhotchkiss 1fa8a35
[deps] more range on mongoose
edwardhotchkiss c81fc3e
[license] added @Jokero to license
edwardhotchkiss 8236882
[major, es6] 8 passing, 5 tests failing
edwardhotchkiss beb90fa
[tests, cleanup] 5 failing tests commented out, fixing and diving deeper
edwardhotchkiss 9c0fd24
[major, tests, fixes] ES6 = 9/13 tests passing
edwardhotchkiss fadddcf
[fix, tests] all tests working except for totals
edwardhotchkiss 0a139e9
[tests, RC6.0] working, all tests passing
edwardhotchkiss 323fe54
Merge branch 'master' into ES6-6.0
edwardhotchkiss 5a881ae
[regression] revert several features back to 5.0
edwardhotchkiss 7a8a11c
[debug] remove mongoose debug
edwardhotchkiss 7867da7
[limit:0] back to original 5.0 feature set, all tests passing
edwardhotchkiss d8e8299
[minor] license, removed hanging space
edwardhotchkiss 8581975
Simple way to handle create required promises
lesterzone 3366694
Merge pull request #85 from lesterzone/internal-promises
niftylettuce File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
language: node_js | ||
|
||
node_js: | ||
- "4.2.4" | ||
- "4.2" | ||
- "stable" | ||
|
||
services: | ||
- mongodb | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,9 +79,9 @@ function paginate(query, options, callback) { | |
if (typeof callback === 'function') { | ||
return callback(null, result); | ||
} | ||
let promise = new Promise(); | ||
promise.resolve(result); | ||
return promise; | ||
return Promise.resolve(result); | ||
}).catch((error) => { | ||
return callback(error); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So better? if (typeof callback === 'function') {
callback(error);
return Promise.reject(error);
} |
||
}); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should not return result of callback as promise value: