Commit 1248b97a authored by Robert Knight's avatar Robert Knight

Merge pull request #2956 from hypothesis/fix-broken-promises-ie

Fix broken promises in IE
parents 740ce284 f16a020f
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"phantom": true, "phantom": true,
"jquery": true, "jquery": true,
"predef": [ "predef": [
"-Promise", // We currently support IE10-11 which lack a Promise global
"angular", "angular",
"assert", "assert",
"after", "after",
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
"it", "it",
"require", "require",
"sinon", "sinon",
"Promise",
"URL" "URL"
] ]
} }
/* jshint node: true */ /* jshint node: true */
'use strict'; 'use strict';
var Promise = require('core-js/library/es6/promise');
var dateUtil = require('../date-util'); var dateUtil = require('../date-util');
var events = require('../events'); var events = require('../events');
......
/* jshint node: true */ /* jshint node: true */
'use strict'; 'use strict';
var Promise = require('core-js/library/es6/promise');
var events = require('../../events'); var events = require('../../events');
var module = angular.mock.module; var module = angular.mock.module;
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
var assign = require('core-js/library/fn/object/assign'); var assign = require('core-js/library/fn/object/assign');
var angular = require('angular'); var angular = require('angular');
var Promise = require('core-js/library/es6/promise');
var events = require('./events'); var events = require('./events');
var retryUtil = require('./retry-util'); var retryUtil = require('./retry-util');
......
'use strict'; 'use strict';
var Promise = require('core-js/library/es6/promise');
describe('annotationMapper', function() { describe('annotationMapper', function() {
var sandbox = sinon.sandbox.create(); var sandbox = sinon.sandbox.create();
var $rootScope; var $rootScope;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment