From 991debfa4e05144f8d8997b01562dfc2fc56cb8c Mon Sep 17 00:00:00 2001 From: Joseph Ramos Date: Fri, 4 Mar 2016 21:17:14 -0500 Subject: [PATCH] Updated ng-file-upload library version for 12.0.x. --- .../default/extensions/file/public/templates/file.html | 2 +- .../default/extensions/form/public/js/form.controllers.js | 6 +++--- applications/default/public/index.html | 4 ++-- applications/default/public/js/app.js | 2 +- bower.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/applications/default/extensions/file/public/templates/file.html b/applications/default/extensions/file/public/templates/file.html index 590255b..70a7c69 100644 --- a/applications/default/extensions/file/public/templates/file.html +++ b/applications/default/extensions/file/public/templates/file.html @@ -1,6 +1,6 @@
- +

{{element.description}}

diff --git a/applications/default/extensions/form/public/js/form.controllers.js b/applications/default/extensions/form/public/js/form.controllers.js index d26d657..ba183a8 100644 --- a/applications/default/extensions/form/public/js/form.controllers.js +++ b/applications/default/extensions/form/public/js/form.controllers.js @@ -17,8 +17,8 @@ angular.module('choko') $scope.element.id = $scope.element.id || 'element-' + $scope.form.name + '-' + $scope.element.name; }]) -.controller('FileElementController', ['$scope', '$controller', '$upload', - function ($scope, $controller, $upload) { +.controller('FileElementController', ['$scope', '$controller', 'Upload', + function ($scope, $controller, Upload) { // Inherit ElementController. $controller('ElementController', { $scope: $scope @@ -38,7 +38,7 @@ angular.module('choko') $scope.onFileSelect = function($files) { for (var i = 0; i < $files.length; i++) { var file = $files[i]; - $scope.upload = $upload.upload({ + $scope.upload = Upload.upload({ url: '/file', file: file }) diff --git a/applications/default/public/index.html b/applications/default/public/index.html index e549643..24ca4d8 100644 --- a/applications/default/public/index.html +++ b/applications/default/public/index.html @@ -35,13 +35,13 @@ - + - + diff --git a/applications/default/public/js/app.js b/applications/default/public/js/app.js index 207e76c..0941c36 100644 --- a/applications/default/public/js/app.js +++ b/applications/default/public/js/app.js @@ -10,7 +10,7 @@ angular.module('choko', [ 'ngResource', 'ngSanitize', 'summernote', - 'angularFileUpload' + 'ngFileUpload' ]) .config(['$locationProvider', function($locationProvider) { diff --git a/bower.json b/bower.json index 6121fdc..6fc7cb7 100644 --- a/bower.json +++ b/bower.json @@ -11,6 +11,6 @@ "angular-sanitize": "1.4.x", "summernote": "0.6.x", "angular-summernote": "0.5.x", - "ng-file-upload": "1.6.x" + "ng-file-upload": "12.0.x" } }