Skip to content

Commit 5e2b610

Browse files
committed
Merge pull request #14 from zachdunn/feature/version-bump
Bumping to v0.1.3
2 parents fc9c802 + 12d903e commit 5e2b610

File tree

4 files changed

+51
-57
lines changed

4 files changed

+51
-57
lines changed

Gruntfile.js

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,53 @@
11
'use strict';
22

33
module.exports = function(grunt) {
4-
// load all grunt tasks
5-
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
6-
7-
grunt.initConfig({
8-
9-
clean: {
10-
dist: {
11-
files: [{
12-
dot: true,
13-
src: ['.tmp', 'dist/*', '!dist/.git*']
14-
}]
15-
}
16-
},
17-
coffee: {
18-
dev: {
19-
options: {
20-
sourceMap: false
21-
},
22-
files: [{
23-
expand: true,
24-
cwd: 'src/directives',
25-
src: '{,*/}*.coffee',
26-
dest: 'src/directives',
27-
ext: '.js'
28-
}]
29-
}
30-
},
31-
concat: {
32-
src: {
33-
src: ['src/directives/angular-camera.js'],
34-
dest: 'dist/angular-camera.js'
35-
}
4+
// load all grunt tasks
5+
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
6+
grunt.initConfig({
7+
clean: {
8+
dist: {
9+
files: [{
10+
dot: true,
11+
src: ['.tmp', 'dist/*', '!dist/.git*']
12+
}]
13+
}
14+
},
15+
coffee: {
16+
dev: {
17+
options: {
18+
sourceMap: false
3619
},
37-
ngmin: {
38-
src: {
39-
src: '<%= concat.src.src %>',
40-
dest: '<%= concat.src.dest %>'
41-
}
42-
},
43-
uglify: {
44-
src: {
45-
files: {
46-
'dist/angular-camera.min.js': '<%= concat.src.dest %>'
47-
}
48-
}
20+
files: [{
21+
expand: true,
22+
cwd: 'src/directives',
23+
src: '{,*/}*.coffee',
24+
dest: 'src/directives',
25+
ext: '.js'
26+
}]
27+
}
28+
},
29+
concat: {
30+
src: {
31+
src: ['src/directives/angular-camera.js'],
32+
dest: 'dist/angular-camera.js'
33+
}
34+
},
35+
ngmin: {
36+
src: {
37+
src: '<%= concat.src.src %>',
38+
dest: '<%= concat.src.dest %>'
39+
}
40+
},
41+
uglify: {
42+
src: {
43+
files: {
44+
'dist/angular-camera.min.js': '<%= concat.src.dest %>'
4945
}
50-
});
51-
52-
53-
grunt.registerTask('build', ['dev', 'clean:dist', 'concat', 'ngmin', 'uglify']);
54-
55-
grunt.registerTask('dev', ['coffee:dev']);
46+
}
47+
}
48+
});
5649

57-
grunt.registerTask('default', ['build']);
58-
};
50+
grunt.registerTask('build', ['dev', 'clean:dist', 'concat', 'ngmin', 'uglify']);
51+
grunt.registerTask('dev', ['coffee:dev']);
52+
grunt.registerTask('default', ['build']);
53+
};

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-camera",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"homepage": "https://github.com/onemightyroar/angular-camera",
55
"authors": [
66
"Zach Dunn <[email protected]>"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-camera",
3-
"version": "0.1.2",
3+
"version": "0.1.3",
44
"dependencies": {},
55
"devDependencies": {
66
"grunt": "~0.4.1",
@@ -18,4 +18,4 @@
1818
"matchdep": "~0.1.1",
1919
"grunt-ngmin": "~0.0.2"
2020
}
21-
}
21+
}

src/directives/angular-camera.coffee

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ angular.module('omr.directives', [])
134134
###*
135135
* @description Add overlay frame to canvas render
136136
* @param {Object} context Reference to target canvas context
137-
138137
###
139138
scope.addFrame = (context, url, callback = false) ->
140139
# Load returned overlay image and draw onto photo canvas
@@ -191,4 +190,4 @@ angular.module('omr.directives', [])
191190
scope.enableCamera() if scope.enabled
192191
else
193192
# Defaulting to photo
194-
scope.enableCamera() if scope.enabled
193+
scope.enableCamera() if scope.enabled

0 commit comments

Comments
 (0)