Merge branch 'master' into pepper

1 files changed, 12 insertions, 2 deletions

diff --git a/js/gallery.js b/js/gallery.js
index 16ecdd8..839316c 100644
--- a/js/gallery.js
+++ b/js/gallery.js
@@ -3,7 +3,10 @@
 
 var gallery = {}
 
-gallery.init = function(){
+gallery.init = function(choose){
+	if (choose) {
+		gallery.choose = choose;
+	}
   gallery.bind()
 }
 
@@ -11,7 +14,6 @@ gallery.bind = function(){
   $("#gallery-random").click(asdf.random)
   $("#gallery-search").submit(dumpfm.search)
   $(document).on("click", "#gallery-images canvas", gallery.click)
-  status("ready")
 }
 
 gallery.load = function(ims){
@@ -43,6 +45,7 @@ gallery.image = function(im){
       $(thumb.canvas).show()
     })
     $(img).click(gallery.choose);
+    $("#persist-image").attr("checked", false)
   }
   try { img.src = im.url; }
   catch(e){ return; }
@@ -52,3 +55,10 @@ gallery.image = function(im){
 gallery.click = function(){
   gallery.choose()
 }
+
+// template for choose function.. bound to an image object
+gallery.choose = function(){
+	var img = this
+  var imageURL = this.src
+}
+