Merge pull request #21081 from colemanw/upgradeAngularFileUploader

Upgrade angular-file-uploader to v2.6.1
civicrm · Aug 11, 2021 · 43a25f5 · 43a25f5
2 parents a281e78 + da9f6ba
commit 43a25f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
diff --git 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',