dry

2 files changed, 27 insertions, 44 deletions

diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js
index baa4873..874b7e1 100644
--- a/themes/okadmin/public/js/app.js
+++ b/themes/okadmin/public/js/app.js
@@ -3,20 +3,8 @@ var OKAdmin = function(){
   // initialize our multi-image uploader with an element and a template
   $(".image-list").each(function(){
     var uploader = new OKUpload ()
-    uploader.bind( $(".add-image-button input", this) )
-    uploader.add = function(data){
-      var url = data[0].extra.Location
-      add_image(url)
-    }
-    // also handle straight image urls
-    $(".add-image-url", this).keydown(pressEnter(function(e){
-      var url = $(this).val()
-      $(this).val("")
-      add_image(url)
-    }))
-
-    // clone and populate template
-    function add_image(url){
+    uploader.bind( this )
+    uploader.add = function(url){
       var imageTemplate = $("#captioned-image-template").html()
       var $el = $(imageTemplate)
       $el.find(".uri").val(url)
@@ -36,20 +24,8 @@ var OKAdmin = function(){
     var $el = $(this)
     
     var uploader = new OKUpload ()
-    uploader.bind( $(".add-image-button input", this) )
-    uploader.add = function(data){
-      var url = data[0].extra.Location
-      add_image(url)
-    }
-    // also handle straight image urls
-    $(".add-image-url", this).keydown(pressEnter(function(e){
-      var url = $(this).val()
-      $(this).val("")
-      add_image(url)
-    }))
-
-    // clone and populate template
-    function add_image(url){
+    uploader.bind( this )
+    uploader.add = function(url){
       $el.find(".uri").val(url)
       $el.find(".caption").val("")
       $el.find("img").attr("src", url)
@@ -173,15 +149,6 @@ var OKAdmin = function(){
       $input.val(JSON.stringify(parsed));
     })
   });
-  
-  function pressEnter(fn){
-    return function(e){
-      if (e.keyCode && e.keyCode !== 13) return
-      e.preventDefault()
-      console.log("hi")
-      fn.apply(this)
-    }
-  }
 }
 
 $(function(){
diff --git a/themes/okadmin/public/js/upload.js b/themes/okadmin/public/js/upload.js
index 39f7427..040654b 100644
--- a/themes/okadmin/public/js/upload.js
+++ b/themes/okadmin/public/js/upload.js
@@ -2,9 +2,14 @@
 var OKUpload = function(){
 	this.action = "/_services/image"
 }
-OKUpload.prototype.bind = function(el){
-  if (el.length) el = el[0]
-  el.addEventListener("change", this.handleFileSelect.bind(this))
+OKUpload.prototype.bind = function(rapper){
+  var uploader = this
+  $(".add-image-button input", rapper).change( uploader.handleFileSelect.bind(uploader) )
+  $(".add-image-url", rapper).keydown(pressEnter(function(e){
+    var url = $(this).val()
+    $(this).val("")
+    uploader.add(url)
+  }))
 }
 OKUpload.prototype.handleFileSelect = function(e) {
   e.stopPropagation();
@@ -33,12 +38,13 @@ OKUpload.prototype.upload = function(f){
   })
   request.done(this.success.bind(this))
 }
-OKUpload.prototype.success = function(media){
-  if (media.error) {
-    console.log(media.error)
+OKUpload.prototype.success = function(data){
+  if (data.error) {
+    console.log(data.error)
     return
   }
-  this.add(media)
+  var url = data[0].extra.Location
+  this.add(url)
 }
 OKUpload.prototype.add = function(media){
   console.log(media)
@@ -46,3 +52,13 @@ OKUpload.prototype.add = function(media){
 OKUpload.prototype.error = function(error){
   throw error
 }
+
+
+
+function pressEnter(fn){
+  return function(e){
+    if (e.keyCode && e.keyCode !== 13) return
+    e.preventDefault()
+    fn.apply(this)
+  }
+}
\ No newline at end of file