Skip to content

updated npm deps and added optional arguments for captured image dimensions #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
capaj wants to merge 5 commits into
base: master
Choose a base branch
from
Open

updated npm deps and added optional arguments for captured image dimensions #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3df0ef5
added capture height and width, updated npm deps
capaj Nov 22, 2014
2a8e570
added description and main to package.json
capaj Nov 22, 2014
6ba3eb6
fixed bower.json
capaj Nov 22, 2014
34cfce4
captrue dimensions now trully optional, canvas dimension are now with…
capaj Nov 23, 2014
69e89ae
event for triggering photo from outer scopes
capaj Nov 23, 2014
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
4 changes: 2 additions & 2 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = function(grunt) {
dest: 'dist/angular-camera.js'
}
},
ngmin: {
ngAnnotate: {
src: {
src: '<%= concat.src.src %>',
dest: '<%= concat.src.dest %>'
Expand All @@ -47,7 +47,7 @@ module.exports = function(grunt) {
}
});

grunt.registerTask('build', ['dev', 'clean:dist', 'concat', 'ngmin', 'uglify']);
grunt.registerTask('build', ['dev', 'clean:dist', 'concat', 'ngAnnotate', 'uglify']);
grunt.registerTask('dev', ['coffee:dev']);
grunt.registerTask('default', ['build']);
};
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-camera",
"version": "0.1.3",
"version": "0.2.2",
Copy link
Member

@zachdunn zachdunn Nov 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the large version bump?

Copy link
Author

@capaj capaj Nov 28, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to do more changes, but I did not in the end.
I needed to increment multiple times as I was in a hurry(hacktahon).
Feel free to merge this as 0.1.4

"homepage": "https://github.com/onemightyroar/angular-camera",
"authors": [
"Zach Dunn <[email protected]>"
Expand All @@ -14,7 +14,7 @@
"video"
],
"dependencies": {
"angular": "~1.2.0"
"angular": "~1.3"
},
"license": "GNU"
}
Loading