Skip to content

Commit a85267a

Browse files
committed
Use when instead of es6-promise
Fixes #194
1 parent 3da6013 commit a85267a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Diff for: modules/components/Routes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var React = require('react');
22
var warning = require('react/lib/warning');
33
var copyProperties = require('react/lib/copyProperties');
4-
var Promise = require('es6-promise').Promise;
4+
var Promise = require('when/lib/Promise');
55
var LocationActions = require('../actions/LocationActions');
66
var Route = require('../components/Route');
77
var Path = require('../helpers/Path');

Diff for: modules/helpers/resolveAsyncState.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var Promise = require('es6-promise').Promise;
1+
var Promise = require('when/lib/Promise');
22

33
/**
44
* Resolves all values in asyncState and calls the setState

Diff for: package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848
"react": ">=0.11.0"
4949
},
5050
"dependencies": {
51-
"es6-promise": "1.0.0",
5251
"events": "1.0.1",
5352
"flux": "2.0.0",
54-
"qs": "1.2.2"
53+
"qs": "1.2.2",
54+
"when": "^3.4.4"
5555
},
5656
"keywords": [
5757
"react",
@@ -64,4 +64,4 @@
6464
"browserify-shim": {
6565
"react": "global:React"
6666
}
67-
}
67+
}

Diff for: specs/AsyncState.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require('./helper');
2-
var Promise = require('es6-promise').Promise;
2+
var Promise = require('when/lib/Promise');
33
var AsyncState = require('../modules/mixins/AsyncState');
44

55
describe('AsyncState', function () {

0 commit comments

Comments
 (0)