Compare commits

...

1 Commits

Author SHA1 Message Date
Victor Woeltjen
162a718eda [Build] Remove Promise polyfill
Fixes #1183.
2016-09-13 11:39:22 -07:00
4 changed files with 1 additions and 17 deletions

View File

@@ -13,7 +13,6 @@
"moment-duration-format": "^1.3.0",
"requirejs": "~2.1.22",
"text": "requirejs-text#^2.0.14",
"es6-promise": "^3.0.2",
"screenfull": "^3.0.0",
"node-uuid": "^1.4.7",
"comma-separated-values": "^3.6.4",

View File

@@ -27,7 +27,6 @@ requirejs.config({
"angular": "bower_components/angular/angular.min",
"angular-route": "bower_components/angular-route/angular-route.min",
"csv": "bower_components/comma-separated-values/csv.min",
"es6-promise": "bower_components/es6-promise/promise.min",
"html2canvas": "bower_components/html2canvas/build/html2canvas.min",
"jsPDF": "bower_components/jspdf/dist/jspdf.min",
"moment": "bower_components/moment/moment",

View File

@@ -30,14 +30,12 @@
define(
[
'require',
'es6-promise',
'./FrameworkLayer',
'angular',
'angular-route'
],
function (
require,
es6promise,
FrameworkLayer,
angular
) {
@@ -56,9 +54,6 @@ define(
return match ? match[1] : "";
}
// Polyfill Promise, in case browser does not natively provide Promise
window.Promise = window.Promise || es6promise.Promise;
// Reconfigure base url, since bundle paths will all be relative
// to the root now.
requirejs.config({"baseUrl": ""});

View File

@@ -36,9 +36,6 @@ Object.keys(window.__karma__.files).forEach(function(file) {
}
});
// Force es6-promise to load.
allTestFiles.unshift('es6-promise');
// Drop legacyRegistry, since it is at a different path by RequireJS config
allTestFiles = allTestFiles.filter(function (file) {
return file.indexOf('legacyRegistry') === -1;
@@ -53,7 +50,6 @@ requirejs.config({
"angular": "bower_components/angular/angular.min",
"angular-route": "bower_components/angular-route/angular-route.min",
"csv": "bower_components/comma-separated-values/csv.min",
"es6-promise": "bower_components/es6-promise/promise.min",
"html2canvas": "bower_components/html2canvas/build/html2canvas.min",
"jsPDF": "bower_components/jspdf/dist/jspdf.min",
"moment": "bower_components/moment/moment",
@@ -89,11 +85,6 @@ requirejs.config({
// we have to kickoff jasmine, as it is asynchronous
callback: function () {
var args = [].slice.apply(arguments);
require(['es6-promise'], function (es6Promise) {
if (!window.Promise) {
window.Promise = es6Promise.Promise;
}
window.__karma__.start.apply(window.__karma__, args);
});
window.__karma__.start.apply(window.__karma__, args);
}
});