From f76b1657246898055d7c991ec0ca9f5b337b60ef Mon Sep 17 00:00:00 2001
From: hukl <contact@smyck.org>
Date: Wed, 2 Sep 2009 19:51:12 +0200
Subject: wow - jquery sucks from time to time. it works now entirely as
 expected but I don't know why it didn't before *sigh*

---
 public/javascripts/admin_interface.js | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

(limited to 'public/javascripts/admin_interface.js')

diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 88a543b..d83274d 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -3,7 +3,6 @@ $(document).ready(function () {
   menu_items.initialize_search();
   meta_data.initialize();
   menu_item_sorter.initialize();
-  image_interface.initialize();
   
   jQuery.ajaxSetup({ 
     'beforeSend': function(xhr) {xhr.setRequestHeader("Accept", "text/javascript")}
@@ -24,13 +23,18 @@ meta_data = {
     $("#metadata").hide();
 
     $("#button").click(function () {
+      
       $("#metadata").slideToggle(1200);
+      image_interface.initialize();
 
       if ($("#button").attr("class") == "unselected") {
         $("#button").attr("class", "selected");        
+        
       }
       else {
         $("#button").attr("class", "unselected");
+        $("#image_browser").hide();
+        $("#image_browser_toggle").attr("class", "unselected");
       }
       
       return false;
@@ -119,10 +123,27 @@ image_interface = {
   initialize : function() {
     
     $("#image_browser").hide();
-    
-    image_interface.bind_image_browser_toggle();
     image_interface.initialize_sortable_image_box();
     image_interface.connect_browser_and_box();
+    image_interface.set_droppable_behavior();
+    image_interface.bind_image_browser_toggle();    
+  },
+  
+  
+  set_droppable_behavior : function() {
+    $("ul#image_box").droppable({
+      out : function(event, ui) {
+        $(ui.draggable).fadeTo("fast", 0.4);
+
+        $(ui.draggable).bind("mouseup", function() {
+          $(this).remove();
+        });
+      },
+      over : function(event, ui) {
+        $(ui.draggable).fadeTo("fast", 1.0);
+        $(ui.draggable).unbind("mouseup");
+      }
+    });
   },
   
   connect_browser_and_box : function() {
@@ -164,21 +185,7 @@ image_interface = {
           });
         }
       }
-    });
-    
-    $("ul#image_box").droppable({
-      out : function(event, ui) {
-        $(ui.draggable).fadeTo("fast", 0.4);
-
-        $(ui.draggable).bind("mouseup", function() {
-          $(this).remove();
-        });
-      },
-      over : function(event, ui) {
-        $(ui.draggable).fadeTo("fast", 1.0);
-        $(ui.draggable).unbind("mouseup");
-      }
-    });
+    });    
   },
   
   bind_image_browser_toggle : function() {
-- 
cgit v1.3