Changeset 2078

Timestamp:

Oct 31, 2011, 5:18:13 PM (12 years ago)

Author:

tjeerd@…

Message:

Live-search was only working in FF, now it is in more browsers

Location:

trunk

Files:

• grails-app/views/visualize/index.gsp (modified) (3 diffs)
• web-app/js/visualization.js (modified) (6 diffs)

trunk/grails-app/views/visualize/index.gsp

@@ -58 +58 @@
                             <div class="block_search">
                                 <img src="${fam.icon( name: 'magnifier' )}" alt="search"/>:
-                                <input type="text" onKeyUp="doSearch('menu_study');" />
-                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_study');" alt="clear search"/>
+                                <input type="text" onKeyUp="doSearch('menu_study','study');" />
+                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_study','study');" alt="clear search"/>
                             </div>
                         </p>
@@ -145 +145 @@
                             <div class="block_search">
                                 <img src="${fam.icon( name: 'magnifier' )}" alt="search"/>:
-                                <input type="text" onKeyUp="doSearch('menu_column');" />
-                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_column');" alt="clear search"/>
+                                <input type="text" onKeyUp="doSearch('menu_column','columns');" />
+                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_column','columns');" alt="clear search"/>
                             </div>
                         </p>
@@ -157 +157 @@
                             <div class="block_search">
                                 <img src="${fam.icon( name: 'magnifier' )}" alt="search"/>:
-                                <input type="text" onKeyUp="doSearch('menu_row');" />
-                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_row');" alt="clear search"/>
+                                <input type="text" onKeyUp="doSearch('menu_row','rows');" />
+                                <img src="${fam.icon( name: 'cancel' )}" class="imgbutton" onClick="clearSearch('menu_row','rows');" alt="clear search"/>
                             </div>
                         </p>

trunk/web-app/js/visualization.js

@@ -5 +5 @@
 var visType = null;
 var openForm = null;
+var selectCache = new Array();
 
 jQuery.expr[':'].Contains = function(a, i, m) {
@@ -43 +44 @@
     });
 
+    selectCache['study'] = $('#study').html();
+
     
 });
@@ -90 +93 @@
                         strOptions += "</optgroup>";
                         $( "#rows, #columns" ).html(strOptions);
+                        selectCache['rows'] = $('#rows').html();
+                        selectCache['columns'] = $('#columns').html();
                     } else {
                         $("#visualization").html('<div style="padding: 30px">No fields could be found. This visualization prototype requires studies with samples.</div>');
+                        selectCache['rows'] = null;
+                        selectCache['columns'] = null;
                     }
                         
@@ -216 +223 @@
                         }
                 });
+
+                if($("#errorbars").attr("checked")=="checked" && returnData.series[ 0 ].error!=null) {
+                    alert("Errorbars aren't implemented yet");
+                }
 
                 // If no datapoints are found, return an error
@@ -475 +486 @@
     $( '#message_counter' ).children(".topmenu_item_info").html($(".message_box").length);
     if($(".message_box").length==0) {
-        $( '#message_counter' ).children(".formulier").toggle();
-        openForm = null;
+        toggleForm('#message_counter', 'close');
     }
 }
@@ -496 +506 @@
 }
 
-function doSearch(menuId) {
+function doSearch(menuId, selectId) {
     var searchVal = $('#'+menuId).find('.block_search').children('input').val();
-    $('#'+menuId).find('option').hide();
-    $('#'+menuId).find('option:Contains("'+searchVal+'")').show();
-}
-
-function clearSearch(menuId) {
-    $('#'+menuId).find('option').show();
+    $('#'+selectId).html(selectCache[selectId]);
+    $('#'+selectId).find('option:not(:Contains("'+searchVal+'"))').remove();
+}
+
+function clearSearch(menuId, selectId) {
+    $('#'+selectId).html(selectCache[selectId]);
     $('#'+menuId).find('.block_search').children('input').val('');
 }