CRM-20243 - bower.json - Upgrade to Angular 1.5.x

Two reasons:
 * Angular 1.3.x is no longer maintained.
 * This is one step toward bringing the CiviCRM and CiviHR codebases into alignment.

diff --git a/bower.json b/bower.json
index d5cda3c0d015cc0b757e6cbbda0db5aa09e389d1..de49d22b08529e0c5b7f2e260043a54ac65753aa 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -5,11 +5,11 @@
   "license": "AGPL-3.0",
   "private": true,
   "dependencies": {
-    "angular": "~1.3.8",
+    "angular": "~1.5.0",
     "angular-file-upload": ">=1.1.5 <=1.1.6",
     "angular-jquery-dialog-service": "totten/angular-jquery-dialog-service#civicrm",
-    "angular-mocks": "~1.3.8",
-    "angular-route": "~1.3.8",
+    "angular-mocks": "~1.5.0",
+    "angular-route": "~1.5.0",
     "angular-ui-sortable": "0.12.x",
     "angular-ui-utils": "0.1.x",
     "angular-unsavedChanges": "~0.1.1",
@@ -25,9 +25,10 @@
     "jstree": "~3",
     "ckeditor": "~4.5",
     "font-awesome": "~4",
-    "angular-sanitize": "~1.3.15"
+    "angular-sanitize": "~1.5.0",
+    "phantomjs-polyfill": "^0.0.2"
   },
   "resolutions": {
-    "angular": "~1.3.8"
+    "angular": "~1.5.11"
   }
 }

diff --git a/karma.conf.js b/karma.conf.js
index eada18ded519964e83d60c5e5d179d07534fd613..8a7ba6eaa212504007b6ed219a41ca23db66d303 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -5,6 +5,7 @@ module.exports = function(config) {
     exclude: [
     ],
     files: [
+      'bower_components/phantomjs-polyfill/bind-polyfill.js',
       'bower_components/jquery/dist/jquery.min.js',
       'bower_components/jquery-ui/jquery-ui.min.js',
       'bower_components/lodash-compat/lodash.min.js',