Skip to content

Commit 51cc05a

Browse files
committed
Updated: es5 to es6 (modules & classes)
(cherry picked from commit 84a7946)
1 parent 2814352 commit 51cc05a

18 files changed

+1611
-1333
lines changed

dist/angular-file-upload.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-file-upload.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,18 @@ gulp.task(
1313
pkg.name + '/build',
1414
function() {
1515
return gulp
16-
.src('./src/module.js')
16+
.src('./src/index.js')
1717
.pipe(webpackStream({
18+
module: {
19+
loaders: [
20+
// https://github.com/babel/babel-loader
21+
{test: /\.js$/, loader: 'babel'},
22+
// https://github.com/webpack/json-loader
23+
{test: /\.json$/, loader: 'json'},
24+
// https://github.com/webpack/html-loader
25+
{test: /\.html$/, loader: 'html'}
26+
]
27+
},
1828
plugins: [
1929
// http://webpack.github.io/docs/list-of-plugins.html#uglifyjsplugin
2030
new webpack.optimize.UglifyJsPlugin({

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-file-upload",
3-
"version": "2.0.1",
3+
"version": "2.1.0",
44
"homepage": "https://github.com/nervgh/angular-file-upload",
55
"description": "Angular File Upload is a module for the AngularJS framework",
66
"author": {
@@ -9,6 +9,10 @@
99
},
1010
"main": "dist/angular-file-upload.min.js",
1111
"devDependencies": {
12+
"babel": "^4.7.16",
13+
"babel-loader": "^4.0.0",
14+
"json-loader": "^0.5.1",
15+
"html-loader": "^0.2.3",
1216
"gulp": "^3.9.0",
1317
"webpack": "^1.10.1",
1418
"webpack-stream": "^2.0.0"

src/config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "angularFileUpload"
3+
}

src/directives/FileDrop.js

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
'use strict';
2+
3+
4+
import CONFIG from './../config.json';
5+
6+
7+
export default function __($parse, FileUploader, FileDrop) {
8+
9+
10+
return {
11+
link: function(scope, element, attributes) {
12+
var uploader = scope.$eval(attributes.uploader);
13+
14+
if (!(uploader instanceof FileUploader)) {
15+
throw new TypeError('"Uploader" must be an instance of FileUploader');
16+
}
17+
18+
if (!uploader.isHTML5) return;
19+
20+
var object = new FileDrop({
21+
uploader: uploader,
22+
element: element
23+
});
24+
25+
object.getOptions = $parse(attributes.options).bind(object, scope);
26+
object.getFilters = function() {return attributes.filters;};
27+
}
28+
};
29+
30+
31+
}
32+
33+
34+
__.$inject = [
35+
'$parse',
36+
'FileUploader',
37+
'FileDrop'
38+
];

src/directives/FileOver.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
'use strict';
2+
3+
4+
import CONFIG from './../config.json';
5+
6+
7+
export default function __(FileUploader, FileOver) {
8+
9+
10+
return {
11+
link: function(scope, element, attributes) {
12+
var uploader = scope.$eval(attributes.uploader);
13+
14+
if (!(uploader instanceof FileUploader)) {
15+
throw new TypeError('"Uploader" must be an instance of FileUploader');
16+
}
17+
18+
var object = new FileOver({
19+
uploader: uploader,
20+
element: element
21+
});
22+
23+
object.getOverClass = function() {
24+
return attributes.overClass || this.overClass;
25+
};
26+
}
27+
};
28+
29+
30+
}
31+
32+
33+
__.$inject = [
34+
'FileUploader',
35+
'FileOver'
36+
];

src/directives/FileSelect.js

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
'use strict';
2+
3+
4+
import CONFIG from './../config.json';
5+
6+
7+
export default function __($parse, FileUploader, FileSelect) {
8+
9+
10+
return {
11+
link: function(scope, element, attributes) {
12+
var uploader = scope.$eval(attributes.uploader);
13+
14+
if (!(uploader instanceof FileUploader)) {
15+
throw new TypeError('"Uploader" must be an instance of FileUploader');
16+
}
17+
18+
var object = new FileSelect({
19+
uploader: uploader,
20+
element: element
21+
});
22+
23+
object.getOptions = $parse(attributes.options).bind(object, scope);
24+
object.getFilters = function() {return attributes.filters;};
25+
}
26+
};
27+
28+
29+
}
30+
31+
32+
__.$inject = [
33+
'$parse',
34+
'FileUploader',
35+
'FileSelect'
36+
];

src/index.js

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
'use strict';
2+
3+
4+
import CONFIG from './config.json';
5+
6+
7+
import options from './values/options'
8+
9+
10+
import serviceFileUploader from './services/FileUploader';
11+
import serviceFileLikeObject from './services/FileLikeObject';
12+
import serviceFileItem from './services/FileItem';
13+
import serviceFileDirective from './services/FileDirective';
14+
import serviceFileSelect from './services/FileSelect';
15+
import serviceFileDrop from './services/FileDrop';
16+
import serviceFileOver from './services/FileOver';
17+
18+
19+
import directiveFileSelect from './directives/FileSelect';
20+
import directiveFileDrop from './directives/FileDrop';
21+
import directiveFileOver from './directives/FileOver';
22+
23+
24+
angular
25+
.module(CONFIG.name, [])
26+
.value('fileUploaderOptions', options)
27+
.factory('FileUploader', serviceFileUploader)
28+
.factory('FileLikeObject', serviceFileLikeObject)
29+
.factory('FileItem', serviceFileItem)
30+
.factory('FileDirective', serviceFileDirective)
31+
.factory('FileSelect', serviceFileSelect)
32+
.factory('FileDrop', serviceFileDrop)
33+
.factory('FileOver', serviceFileOver)
34+
.directive('nvFileSelect', directiveFileSelect)
35+
.directive('nvFileDrop', directiveFileDrop)
36+
.directive('nvFileOver', directiveFileOver)
37+
.run([
38+
'FileUploader',
39+
'FileLikeObject',
40+
'FileItem',
41+
'FileDirective',
42+
'FileSelect',
43+
'FileDrop',
44+
'FileOver',
45+
function(FileUploader, FileLikeObject, FileItem, FileDirective, FileSelect, FileDrop, FileOver) {
46+
// only for compatibility
47+
FileUploader.FileLikeObject = FileLikeObject;
48+
FileUploader.FileItem = FileItem;
49+
FileUploader.FileDirective = FileDirective;
50+
FileUploader.FileSelect = FileSelect;
51+
FileUploader.FileDrop = FileDrop;
52+
FileUploader.FileOver = FileOver;
53+
}
54+
]);

0 commit comments

Comments
 (0)