Changeset 2008

Timestamp:

Sep 8, 2011, 3:05:57 PM (12 years ago)

Author:

tjeerd@…

Message:

New improved interface stuff in visualization.js

File:

• trunk/web-app/js/visualization.js (modified) (7 diffs)

trunk/web-app/js/visualization.js

@@ -54 +54 @@
                 });
 
-                $( "#menu_study" ).find("img.spinner").hide();
-                $( "#menu_study" ).removeClass().addClass("menu_item menu_item_done");
+                clearStep(".menu_item");
+                $( "#menu_study" ).find("div.menu_item_info").html("<br />"+$( '#study option:selected' ).text());
+                $( "#menu_study" ).addClass("menu_item_done");
                 $( "#menu_row, #menu_column" ).addClass("menu_item_fill");
             }
@@ -61 +62 @@
     } else {
         $( '#rows, #columns' ).empty();
-        $( ".menu_item" ).removeClass().addClass("menu_item");
+        clearStep(".menu_item");
         $( "#menu_study" ).addClass("menu_item_fill");
-        $( '.menu_item' ).find(".menu_item_info").html("");
     }
 }
@@ -80 +80 @@
         $( "#"+divid ).find("img.spinner").show();
 
-        $( "#"+divid ).find("div.menu_item_info").html("<br />"+$( '#'+type+' option:selected' ).text());
         executeAjaxCall( "getVisualizationTypes", {
             "errorMessage": "An error occurred while retrieving visualization types from the server. Please try again or contact a system administrator.",
@@ -99 +98 @@
                     });
 
-                    $( '#menu_vis' ).removeClass().addClass("menu_item");
-                    $( '#menu_vis' ).find(".menu_item_info").html("");
+                    clearStep("#menu_vis");
                 }
 
-                $( "#"+divid ).find("img.spinner").hide();
-                $( "#"+divid ).removeClass().addClass("menu_item menu_item_done");
+                clearStep("#"+divid);
+                $( "#"+divid ).find("div.menu_item_info").html("<br />"+$( '#'+type+' option:selected' ).text());
+                $( "#"+divid ).addClass("menu_item_done");
 
                 if((!$( "#menu_vis" ).hasClass("menu_item_done")) &&
@@ -110 +109 @@
                         ($( "#menu_column" ).hasClass("menu_item_done") || divid=="menu_column")
                         ) {
+                    clearStep("#menu_vis");
                     $( "#menu_vis" ).addClass("menu_item_fill");
                 }
@@ -115 +115 @@
         },divid);
     } else {
-        $( '#menu_vis' ).removeClass().addClass("menu_item");
-        $( "#"+divid ).removeClass().addClass("menu_item menu_item_fill");
-        $( "#"+divid ).find(".menu_item_info").html("");
-        $( '#menu_vis' ).find(".menu_item_info").html("");
+        clearStep("#menu_vis, #"+divid);
+        $( "#"+divid ).addClass("menu_item_fill");
     }
 }
@@ -239 +237 @@
 }
 
+
+/**
+ * Clears one or multiple steps
+ * @param data
+ */
+function clearStep(strSelector) {
+    $( strSelector ).removeClass().addClass("menu_item");
+    $( strSelector ).find(".menu_item_info").html("");
+    $( strSelector ).find("img.spinner").hide();
+}
+
 /** 
  * Checks whether the data in the getData call can be handled correctly