suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #398 from openpgpjs/promise-polyfill

Browse Source 
Promise polyfill
This commit is contained in:
Tankred Hase 2016-01-30 17:55:30 +07:00
commit a41a087616
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -7,6 +7,8 @@ matrix:
env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='0.12' env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='0.12'
- node_js: "4.2" - node_js: "4.2"
env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2' env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2'
- node_js: "5"
env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='5'
- node_js: "0.12" - node_js: "0.12"
env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38' env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
- node_js: "0.12" - node_js: "0.12"
@ -37,6 +39,7 @@ matrix:
env: OPENPGPJSTEST='end2end-13' BROWSER='iphone 9.1' env: OPENPGPJSTEST='end2end-13' BROWSER='iphone 9.1'
allow_failures: allow_failures:
- env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2' - env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='4.2'
- env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='5'
- env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38' - env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
- env: OPENPGPJSTEST='end2end-1' BROWSER='firefox 42' - env: OPENPGPJSTEST='end2end-1' BROWSER='firefox 42'
- env: OPENPGPJSTEST='end2end-2' BROWSER='firefox beta' - env: OPENPGPJSTEST='end2end-2' BROWSER='firefox beta'

2
package.json
View File

@ -55,7 +55,7 @@
"fsevents": "^1.0.6" "fsevents": "^1.0.6"
}, },
"dependencies": { "dependencies": {
"es6-promise": "~3.0.2", "es6-promise": "^1.0.0",
"node-fetch": "^1.3.3", "node-fetch": "^1.3.3",
"node-localstorage": "~1.1.2", "node-localstorage": "~1.1.2",
"zlibjs": "~0.2.0" "zlibjs": "~0.2.0"

5
src/openpgp.js
View File

@ -41,10 +41,7 @@ var armor = require('./encoding/armor.js'),
util = require('./util'), util = require('./util'),
AsyncProxy = require('./worker/async_proxy.js'); AsyncProxy = require('./worker/async_proxy.js');
if (typeof Promise === 'undefined') { require('es6-promise').polyfill(); // load ES6 Promises polyfill
// load ES6 Promises polyfill
require('es6-promise').polyfill();
}
var asyncProxy = null; // instance of the asyncproxy var asyncProxy = null; // instance of the asyncproxy