summaryrefslogtreecommitdiff
path: root/public/assets/js/lib/views/PhotoView.js
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/js/lib/views/PhotoView.js')
-rw-r--r--public/assets/js/lib/views/PhotoView.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/public/assets/js/lib/views/PhotoView.js b/public/assets/js/lib/views/PhotoView.js
index e7b0732..ea77e01 100644
--- a/public/assets/js/lib/views/PhotoView.js
+++ b/public/assets/js/lib/views/PhotoView.js
@@ -60,11 +60,16 @@ var PhotoView = (function(){
this.$ratio.val()
this.updateRatio()
}.bind(this)
-
- this.load("/assets/img/test.png")
},
- load: function(url){
+ load: function(f){
+ var url
+ if (typeof f == "string") {
+ url = f
+ }
+ else {
+ url = URL.createObjectURL(file)
+ }
this.img.src = url
console.log("load", url)
this.show()