Use newer phantom polyfill for PhantomJS 1.x

https://github.com/angular/angular.js/issues/13794

The 0.0.1 polyfill for PhantomJS no longer worked so I'm replacing it.
We should consider upgrading to PhantomJS 2.x, though.
pull/4851/head
Oliver Günther 8 years ago
parent 8f2db06a03
commit 1a0f27a739
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 2
      frontend/app/angular-modules.ts
  2. 2
      frontend/app/global.js
  3. 2
      frontend/bower.json
  4. 2481
      frontend/npm-shrinkwrap.json
  5. 2
      frontend/package.json

@ -30,7 +30,7 @@ declare const I18n: op.I18n;
// global // global
export const opUiComponentsModule = angular.module('openproject.uiComponents', export const opUiComponentsModule = angular.module('openproject.uiComponents',
['ui.select', 'ui.router', 'ngSanitize', 'openproject.workPackages.services']) ['ui.select', 'ui.router', 'openproject.workPackages.services'])
.run(['$rootScope', function ($rootScope) { .run(['$rootScope', function ($rootScope) {
$rootScope.I18n = I18n; $rootScope.I18n = I18n;
}]); }]);

@ -32,7 +32,7 @@
// NOTE: currently needed for PhantomJS to support Webpack's style-loader. // NOTE: currently needed for PhantomJS to support Webpack's style-loader.
// See: https://github.com/webpack/style-loader/issues/31 // See: https://github.com/webpack/style-loader/issues/31
require('polyfill-function-prototype-bind'); require('phantomjs-polyfill');
require('jquery'); require('jquery');
require('jquery-migrate/jquery-migrate'); require('jquery-migrate/jquery-migrate');

@ -34,7 +34,7 @@
}, },
"devDependencies": { "devDependencies": {
"mocha": "~1.14.0", "mocha": "~1.14.0",
"angular-mocks": "~1.5.5", "angular-mocks": "~1.5.8",
"chai": "~1.9.0", "chai": "~1.9.0",
"jquery-mockjax": "~1.5.3" "jquery-mockjax": "~1.5.3"
}, },

File diff suppressed because it is too large Load Diff

@ -46,7 +46,7 @@
"ng-annotate-loader": "0.0.10", "ng-annotate-loader": "0.0.10",
"ngtemplate-loader": "^0.1.2", "ngtemplate-loader": "^0.1.2",
"observable-array": "0.0.4", "observable-array": "0.0.4",
"polyfill-function-prototype-bind": "0.0.1", "phantomjs-polyfill": "0.0.2",
"shelljs": "^0.3.0", "shelljs": "^0.3.0",
"style-loader": "^0.8.2", "style-loader": "^0.8.2",
"ts-loader": "^0.7.2", "ts-loader": "^0.7.2",

Loading…
Cancel
Save