Permalink
Browse files

kinda working

  • Loading branch information...
1 parent 732ff2b commit c762246c921d2ee5e564024bbca17a785f9326d9 @tofumatt tofumatt committed May 3, 2012
Showing with 7 additions and 5 deletions.
  1. +3 −0 index.html
  2. +1 −1 js/app.js
  3. +3 −4 js/camera.js
View
3 index.html
@@ -43,7 +43,10 @@
<input type="file" id="take-picture" accept="image/*">
<img src="" id="target">
+ <!--
<canvas id="canvas"></canvas>
+ -->
+ <div id="canvas-box"></div>
<div id="filters">
<button type="submit" class="btn" data-filter="age">Age</button>
View
2 js/app.js
@@ -28,7 +28,7 @@
$('#filters button').click(function(e) {
e.preventDefault();
- Caman("example.jpg", "canvas", filters[$(this).data('filter')]);
+ Caman("#canvas", filters[$(this).data('filter')]);
});
})()
View
7 js/camera.js
@@ -19,9 +19,8 @@
// Set img src to ObjectURL
showPicture.src = imgURL;
-
- // Revoke ObjectURL
- URL.revokeObjectURL(imgURL);
+
+ $('#canvas-box').html('<img id="canvas" src="' + showPicture.src + '">');
}
catch (e) {
try {
@@ -45,4 +44,4 @@
}
};
}
-})();
+})();

0 comments on commit c762246

Please sign in to comment.