From f48f8dbffa2c28fa3960e7dfa32bcd0a8bb70a3e Mon Sep 17 00:00:00 2001
From: Max Ogden <max@maxogden.com>
Date: Sat, 2 Jul 2011 16:28:59 -0700
Subject: [PATCH] refactoring show/hide/position functions

---
 attachments/pages/index.html     |  4 ++--
 attachments/script/removalist.js | 20 ++++++--------------
 attachments/script/site.js       |  4 ++--
 attachments/script/util.js       | 14 +++++++++++++-
 attachments/style/data-table.css |  2 +-
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/attachments/pages/index.html b/attachments/pages/index.html
index b5edf9cc..7e0b6e91 100644
--- a/attachments/pages/index.html
+++ b/attachments/pages/index.html
@@ -37,7 +37,7 @@
   </div>
   
   <div class="dialog-overlay" style="display: none; z-index: 101; ">&nbsp;</div>
-  <div class="dialog-container ui-draggable" style="display: none; z-index: 102; top: 101px; ">
+  <div class="dialog ui-draggable" style="display: none; z-index: 102; top: 101px; ">
   	<div class="dialog-frame" style="width: 700px; visibility: visible; ">
   		<div id="dialog-content" class="dialog-border">
   			
@@ -76,7 +76,7 @@
   
   <script type='text/mustache' id="exportActionsTemplate">
     <li><a class="csv" href="JavaScript:void(0);">CSV</a></li>
-    <li><a class="csv" href="JavaScript:void(0);">JSON</a></li>
+    <li><a class="json" href="JavaScript:void(0);">JSON</a></li>
   </script>
   
   <script type='text/mustache' id="columnActionsTemplate">
diff --git a/attachments/script/removalist.js b/attachments/script/removalist.js
index 007b4431..62c3e5dd 100644
--- a/attachments/script/removalist.js
+++ b/attachments/script/removalist.js
@@ -7,29 +7,21 @@ var removalist = function() {
   function handleMenuClick() {
     $( '.menu li' ).click(function(e) {
       if ($(e.target).hasClass('transform')) {
-        $('.dialog-overlay').show();
-        $('.dialog-container').show();
+        util.show('dialog');
         util.render('bulkEdit', 'dialog-content');
         $('.cancelButton').click(function(e) {
-          $('.dialog-overlay').hide();
-          $('.dialog-container').hide();
+          util.hide('dialog');
         })
-        $('.menu').hide();
-        $('.menu-overlay').hide();
+        util.hide('menu');
       }
       
-      if ($(e.target).hasClass('csv')) {
-        window.location.href = app.csvUrl;
-      }
+      if ($(e.target).hasClass('csv'))  window.location.href = app.csvUrl;
       
-      if ($(e.target).hasClass('json')) {
-        window.location.href = app.csvUrl;
-      }
+      if ($(e.target).hasClass('json')) window.location.href = "_rewrite/api/json";
       
       e.preventDefault();
       
-      $('.menu').hide();
-      $('.menu-overlay').hide();
+      util.hide('menu');
     }) 
   }
   
diff --git a/attachments/script/site.js b/attachments/script/site.js
index 9d81e19c..7847b862 100644
--- a/attachments/script/site.js
+++ b/attachments/script/site.js
@@ -27,13 +27,13 @@ app.after = {
   },
   dataTable: function() {
     $('.column-header-menu').click(function(e) { 
-      util.show('menu', e);
+      util.position('menu', e);
       util.render('columnActions', 'menu');
     });
   },
   actions: function() {
     $('.button').click(function(e) { 
-      util.show('menu', e, {left: -60});
+      util.position('menu', e, {left: -60});
       util.render('exportActions', 'menu');
     });
   },
diff --git a/attachments/script/util.js b/attachments/script/util.js
index f1555095..04117de5 100644
--- a/attachments/script/util.js
+++ b/attachments/script/util.js
@@ -24,7 +24,17 @@ var util = function() {
     return exists;
   }
   
-  function show( thing, elem, offset ) {
+  function show( thing ) {
+    $('.' + thing ).show();
+    $('.' + thing + '-overlay').show();
+  }
+
+  function hide( thing ) {
+    $('.' + thing ).hide();
+    $('.' + thing + '-overlay').hide();
+  }
+  
+  function position( thing, elem, offset ) {
     var position = $(elem.target).offset();
     if (offset) {
       if (offset.top) position.top += offset.top;
@@ -136,6 +146,8 @@ var util = function() {
   return {
     inURL: inURL,
     show: show,
+    hide: hide,
+    position: position,
     render: render,
     formatMetadata:formatMetadata,
     getBaseURL:getBaseURL,
diff --git a/attachments/style/data-table.css b/attachments/style/data-table.css
index 86a9ae3f..1819b7c1 100644
--- a/attachments/style/data-table.css
+++ b/attachments/style/data-table.css
@@ -877,7 +877,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   opacity: 0.5;
 }
 
-.dialog-container {
+.dialog {
   position: fixed;
   left: 0;
   width: 100%;