Skip to content

Commit

Permalink
Merge branch 'master' into new-namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
bekzod committed Jul 25, 2017
2 parents c65214b + 81af1f4 commit c933968
Show file tree
Hide file tree
Showing 4 changed files with 80 additions and 88 deletions.
39 changes: 0 additions & 39 deletions lib/rsvp.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
import Promise from './rsvp/promise';
import EventTarget from './rsvp/events';

import denodeify from './rsvp/promise/node';
import all from './rsvp/promise/all';
import allSettled from './rsvp/promise/all-settled';
import race from './rsvp/promise/race';
import hash from './rsvp/promise/hash';
import hashSettled from './rsvp/promise/hash-settled';
import rethrow from './rsvp/promise/rethrow';
import defer from './rsvp/promise/defer';
import map from './rsvp/promise/map';
import resolve from './rsvp/promise/resolve';
import reject from './rsvp/promise/reject';
import filter from './rsvp/promise/filter';

import asap from './rsvp/asap';
import {
config,
configure
} from './rsvp/config';

// defaults
config.async = asap;
config.after = cb => setTimeout(cb, 0);
Expand Down Expand Up @@ -52,42 +37,18 @@ export default {
asap,
Promise,
EventTarget,
all,
allSettled,
race,
hash,
hashSettled,
rethrow,
defer,
denodeify,
configure,
on,
off,
resolve,
reject,
map,
['async']: async, // babel seems to error if async isn't a computed prop here...
filter
};

export {
asap,
Promise,
EventTarget,
all,
allSettled,
race,
hash,
hashSettled,
rethrow,
defer,
denodeify,
configure,
on,
off,
resolve,
reject,
map,
async,
filter
};
2 changes: 1 addition & 1 deletion lib/rsvp/promise/filter.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class FilterEnumerator extends Enumerator {
}
} else {
this._remaining--;
if (value !== true) {
if (!value) {
this._result[i] = EMPTY_OBJECT;
}
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "rsvp",
"namespace": "RSVP",
"version": "4.0.0",
"version": "4.0.1",
"description": "A lightweight library that provides tools for organizing asynchronous code",
"main": "dist/rsvp.js",
"module": "dist/rsvp.es.js",
Expand Down
Loading

0 comments on commit c933968

Please sign in to comment.