Skip to content

Commit

Permalink
Minified version
Browse files Browse the repository at this point in the history
  • Loading branch information
@asafdav
asafdav committed Nov 13, 2013
1 parent a39eec5 commit 0cda909
Show file tree
Hide file tree
Showing 5 changed files with 247 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ module.exports = function (grunt) {
src: [
'src/<%= library.name %>/<%= library.name %>.prefix',
'src/<%= library.name %>/<%= library.name %>.js',
'src/<%= library.name %>/services/**/*.js',
'src/<%= library.name %>/directives/**/*.js',
'src/<%= library.name %>/filters/**/*.js',
'src/<%= library.name %>/services/**/*.js',
'src/<%= library.name %>/<%= library.name %>.suffix'
],
dest: 'build/<%= library.name %>.js'
Expand Down
226 changes: 226 additions & 0 deletions build/ng-s3upload.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
(function(window, document) {

// Create all modules and define dependencies to make sure they exist
// and are loaded in the correct order to satisfy dependency injection
// before all nested files are concatenated by Grunt

// Config
angular.module('ngS3upload.config', []).
value('ngS3upload.config', {
debug: true
}).
config(['$compileProvider', function($compileProvider){
if (angular.isDefined($compileProvider.urlSanitizationWhitelist)) {
$compileProvider.urlSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/);
} else {
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|file|data):/);
}
}]);

// Modules
angular.module('ngS3upload.directives', []);
angular.module('ngS3upload',
[
'ngS3upload.config',
'ngS3upload.directives',
'ngS3upload.services',
'ngSanitize'
]);
angular.module('ngS3upload.services', []).
service('S3Uploader', ['$http', '$q', '$window', function ($http, $q, $window) {
this.uploads = 0;
var self = this;

this.getUploadOptions = function (uri) {
var deferred = $q.defer();
$http.get(uri).
success(function (response, status) {
deferred.resolve(response);
}).error(function (error, status) {
deferred.reject(error);
});

return deferred.promise;
};

this.randomString = function (length) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
var result = '';
for (var i = length; i > 0; --i) result += chars[Math.round(Math.random() * (chars.length - 1))];

return result;
};


this.upload = function (scope, uri, key, acl, type, accessKey, policy, signature, file) {
var deferred = $q.defer();
scope.attempt = true;

var fd = new FormData();
fd.append('key', key);
fd.append('acl', acl);
fd.append('Content-Type', file.type);
fd.append('AWSAccessKeyId', accessKey);
fd.append('policy', policy);
fd.append('signature', signature);
fd.append("file", file);

var xhr = new XMLHttpRequest();
xhr.upload.addEventListener("progress", uploadProgress, false);
xhr.addEventListener("load", uploadComplete, false);
xhr.addEventListener("error", uploadFailed, false);
xhr.addEventListener("abort", uploadCanceled, false);

// Define event handlers
function uploadProgress(e) {
scope.$apply(function () {
if (e.lengthComputable) {
scope.progress = Math.round(e.loaded * 100 / e.total);
} else {
scope.progress = 'unable to compute';
}
});
}
function uploadComplete(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = true;
deferred.resolve();
});
}
function uploadFailed(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = false;
deferred.reject();
});
}
function uploadCanceled(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = false;
deferred.reject();
});
}

// Send the file
scope.uploading = true;
this.uploads++;
xhr.open('POST', uri, true);
xhr.send(fd);

return deferred.promise;
};

this.isUploading = function () {
return this.uploads > 0;
};
}]);
angular.module('ngS3upload.directives', []).
directive('s3Upload', ['$parse', 'S3Uploader', function ($parse, S3Uploader) {
return {
restrict: 'AC',
require: '?ngModel',
replace: true,
transclude: false,
scope: true,
controller: ['$scope', '$element', '$attrs', '$transclude', function ($scope, $element, $attrs, $transclude) {
$scope.attempt = false;
$scope.success = false;
$scope.uploading = false;

$scope.barClass = function () {
return {
"bar-success": $scope.attempt && !$scope.uploading && $scope.success
};
};
}],
compile: function (element, attr, linker) {
return {
pre: function ($scope, $element, $attr) {
if (angular.isUndefined($attr.bucket)) {
throw Error('bucket is a mandatory attribute');
}
},
post: function (scope, element, attrs, ngModel) {
// Build the opts array
var opts = angular.extend({}, scope.$eval(attrs.s3UploadOptions || attrs.options));
opts = angular.extend({
submitOnChange: true,
getOptionsUri: '/getS3Options',
acl: 'public-read',
uploadingKey: 'uploading',
folder: ''
}, opts);
var bucket = scope.$eval(attrs.bucket);

// Bind the button click event
var button = angular.element(element.children()[0]),
file = angular.element(element.find("input")[0]);
button.bind('click', function (e) {
file[0].click();
});

// Update the scope with the view value
ngModel.$render = function () {
scope.filename = ngModel.$viewValue;
};

var uploadFile = function () {
var selectedFile = file[0].files[0];
var filename = selectedFile.name;
var ext = filename.split('.').pop();

scope.$apply(function () {
S3Uploader.getUploadOptions(opts.getOptionsUri).then(function (s3Options) {
ngModel.$setValidity('uploading', false);
var s3Uri = 'https://' + bucket + '.s3.amazonaws.com/' + opts.folder;
var key = (new Date()).getTime() + '-' + S3Uploader.randomString(16) + "." + ext;
S3Uploader.upload(scope,
s3Uri,
key,
opts.acl,
selectedFile.type,
s3Options.key,
s3Options.policy,
s3Options.signature,
selectedFile
).then(function () {
ngModel.$setViewValue(s3Uri + key);
scope.filename = ngModel.$viewValue;
ngModel.$setValidity('uploading', true);
ngModel.$setValidity('succeeded', true);
}, function () {
scope.filename = ngModel.$viewValue;
ngModel.$setValidity('uploading', true);
ngModel.$setValidity('succeeded', false);
});

}, function (error) {
throw Error("Can't receive the needed options for S3 " + error);
});
});
};

element.bind('change', function (nVal) {
if (opts.submitOnChange) {
uploadFile();
}
});
}
};
},
template: '<div class="upload-wrap">' +
'<button class="btn btn-primary" type="button"><span ng-if="!filename">Choose file</span><span ng-if="filename">Replace file</span></button>' +
'<a ng-href="{{ filename }}" target="_blank" class="" ng-if="filename" > Stored file </a>' +
'<div class="progress progress-striped" ng-class="{active: uploading}" ng-show="attempt" style="margin-top: 10px">' +
'<div class="bar" style="width: {{ progress }}%;" ng-class="barClass()"></div>' +
'</div>' +
'<input type="file" style="display: none"/>' +
'</div>'
};
}]);
})(window, document);
2 changes: 2 additions & 0 deletions build/ng-s3upload.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 8 additions & 9 deletions src/ng-s3upload/directives/s3-upload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ angular.module('ngS3upload.directives', []).
var ext = filename.split('.').pop();

scope.$apply(function () {
S3Uploader.getUploadOptions(opts['getOptionsUri']).then(function (s3Options) {
S3Uploader.getUploadOptions(opts.getOptionsUri).then(function (s3Options) {
ngModel.$setValidity('uploading', false);
var s3Uri = 'https://' + bucket + '.s3.amazonaws.com/' + opts['folder'];
var key = (new Date).getTime() + '-' + S3Uploader.randomString(16) + "." + ext;
var s3Uri = 'https://' + bucket + '.s3.amazonaws.com/' + opts.folder;
var key = (new Date()).getTime() + '-' + S3Uploader.randomString(16) + "." + ext;
S3Uploader.upload(scope,
s3Uri,
key,
opts['acl'],
opts.acl,
selectedFile.type,
s3Options.key,
s3Options.policy,
Expand All @@ -85,13 +85,12 @@ angular.module('ngS3upload.directives', []).
};

element.bind('change', function (nVal) {
if (opts['submitOnChange']) {
if (opts.submitOnChange) {
uploadFile();
}
});

}
}
};
},
template: '<div class="upload-wrap">' +
'<button class="btn btn-primary" type="button"><span ng-if="!filename">Choose file</span><span ng-if="filename">Replace file</span></button>' +
Expand All @@ -101,5 +100,5 @@ angular.module('ngS3upload.directives', []).
'</div>' +
'<input type="file" style="display: none"/>' +
'</div>'
}
}]);
};
}]);
21 changes: 10 additions & 11 deletions src/ng-s3upload/services/s3-uploader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ angular.module('ngS3upload.services', []).
});

return deferred.promise;
}
};

this.randomString = function (length) {
var chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
var result = '';
for (var i = length; i > 0; --i) result += chars[Math.round(Math.random() * (chars.length - 1))];

return result;
}
};


this.upload = function (scope, uri, key, acl, type, accessKey, policy, signature, file) {
Expand Down Expand Up @@ -52,31 +52,31 @@ angular.module('ngS3upload.services', []).
scope.progress = 'unable to compute';
}
});
};
}
function uploadComplete(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = true;
deferred.resolve();
});
};
}
function uploadFailed(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = false;
deferred.reject();
});
};
}
function uploadCanceled(e) {
scope.$apply(function () {
self.uploads--;
scope.uploading = false;
scope.success = false;
deferred.reject();
});
};
}

// Send the file
scope.uploading = true;
Expand All @@ -85,10 +85,9 @@ angular.module('ngS3upload.services', []).
xhr.send(fd);

return deferred.promise;
}
};

this.isUploading = function () {
this.uploads > 0;
}

}]);
return this.uploads > 0;
};
}]);

0 comments on commit 0cda909

Please sign in to comment.