Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div ck-file-element class="form-group">
<label ng-if="element.title" for="{{element.id}}">{{element.title}}</label>
<input ng-model="data[element.name]" ng-required="element.required" ng-file-select="onFileSelect($files)" type="file" class="form-control" name="{{element.name}}" id="{{element.id}}" placeholder="{{element.placeholder}}">
<input ng-model="data[element.name]" ng-required="element.required" ngf-select="onFileSelect($files)" type="file" class="form-control" name="{{element.name}}" id="{{element.id}}" placeholder="{{element.placeholder}}">
<p ng-if="element.description" class="help-block">{{element.description}}</p>
<div ng-show="progress" class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{progress}}" aria-valuemin="0" aria-valuemax="100" style="width: {{progress}}%;">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
})
Expand Down
4 changes: 2 additions & 2 deletions applications/default/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
<script src="/lib/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="/lib/summernote/dist/summernote.min.js"></script>

<script src="/lib/ng-file-upload/angular-file-upload-shim.min.js"></script>
<script src="/lib/ng-file-upload/ng-file-upload-shim.min.js"></script>
<script src="/lib/angular/angular.min.js"></script>
<script src="/lib/angular-route/angular-route.min.js"></script>
<script src="/lib/angular-resource/angular-resource.min.js"></script>
<script src="/lib/angular-sanitize/angular-sanitize.min.js"></script>
<script src="/lib/angular-summernote/dist/angular-summernote.min.js"></script>
<script src="/lib/ng-file-upload/angular-file-upload.min.js"></script>
<script src="/lib/ng-file-upload/ng-file-upload.min.js"></script>

<script src="/js/app.js"></script>
<script src="/js/services.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion applications/default/public/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ angular.module('choko', [
'ngResource',
'ngSanitize',
'summernote',
'angularFileUpload'
'ngFileUpload'
])

.config(['$locationProvider', function($locationProvider) {
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}