Upgrade angular-file-uploader to v2.6.1

diff --git a/ang/angularFileUpload.ang.php b/ang/angularFileUpload.ang.php
index 66a35f3dc4f8df44039ce81ca039434ff111046a..1d36fba5f2cb5358af4f05870af98c1fd205a156 100644 (file)
--- a/ang/angularFileUpload.ang.php
+++ b/ang/angularFileUpload.ang.php
@@ -2,5 +2,5 @@
 // This file declares an Angular module which can be autoloaded
 return [
   'ext' => 'civicrm',
-  'js' => ['bower_components/angular-file-upload/angular-file-upload.min.js'],
+  'js' => ['bower_components/angular-file-upload/dist/angular-file-upload.min.js'],
 ];

diff --git a/composer.json b/composer.json
index fcfe5c848aafeb92b8a00e38b565a13c6b66eda3..d4839ccbde0cac60403c6e090388dadd276deb6a 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -136,8 +136,8 @@
         "url": "https://github.com/angular-ui/bootstrap-bower/archive/2.5.0.zip"
       },
       "angular-file-upload": {
-        "url": "https://github.com/nervgh/angular-file-upload/archive/v1.1.6.zip",
-        "ignore": ["examples"]
+        "url": "https://github.com/nervgh/angular-file-upload/archive/2.6.1.zip",
+        "ignore": ["examples", "src"]
       },
       "angular-jquery-dialog-service": {
         "url": "https://github.com/totten/angular-jquery-dialog-service/archive/v0.8.0-civicrm-1.0.zip"

diff --git a/composer.lock b/composer.lock
index d1f8ec822c40b0fbe3d0ed480c77f2a2a0a5ac1e..2648ad73f3e7c50cfa76b9e82305300305991d05 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "58272f5bca4104f5bab01213016da6e7",
+    "content-hash": "127a1f748210d2bbea50645b5c0b2663",
     "packages": [
         {
             "name": "adrienrn/php-mimetyper",

diff --git a/karma.conf.js b/karma.conf.js
index ced9781003d02950821d61f4e18adb06382d4a49..787b6752c258447eb0c4f6b2cab5a2e12c5d4543 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -36,7 +36,7 @@ module.exports = function(config) {
       'js/crm.datepicker.js',
       'bower_components/angular/angular.js',
       angularTempFile,
-      'bower_components/angular-file-upload/angular-file-upload.js',
+      'bower_components/angular-file-upload/dist/angular-file-upload.js',
       'bower_components/angular-jquery-dialog-service/dialog-service.js',
       'bower_components/angular-route/angular-route.js',
       'bower_components/angular-mocks/angular-mocks.js',