From 54475086f2e47a61271a3f0c408bc68b54c6020f Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 15 Nov 2016 17:35:19 -0500 Subject: linkin photos --- public/assets/js/lib/views/PhotoView.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'public/assets/js/lib/views/PhotoView.js') 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() -- cgit v1.2.3-70-g09d2