X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fstatic%2Fjs%2Fsimplelist.js;h=2c05345eb2253cffefee7e8eded0697b32de4c78;hb=3e10237eda530fdbe21b5b43b65b2bba9a28213c;hp=7cce7dcc39bd651d881b68e876e8a9c5776e0eeb;hpb=ed83c34a12ada274e6ac7c17c95a252b57a685a3;p=unfold.git

diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js
index 7cce7dcc..2c05345e 100644
--- a/plugins/static/js/simplelist.js
+++ b/plugins/static/js/simplelist.js
@@ -9,7 +9,7 @@
  * License: GPLv3
  */
 
-simplelist_debug=false;
+simplelist_debug=true;
 
 (function($){
     var methods = {
@@ -24,7 +24,7 @@ simplelist_debug=false;
 		    /* Subscribe to query updates */
 		    var channel='/results/' + options.query_uuid + '/changed';
 		    /* passing $this as 2nd arg: callbacks will retrieve $this as e.data */
-		    $.subscribe(channel, $this, update_list);
+		    $.subscribe(channel, $this, update_table);
 		    if (simplelist_debug) window.console.log('subscribing to ' + channel);
 		    $this.data('SimpleList', {options: options, SimpleList : SimpleList});
 		}
@@ -53,41 +53,66 @@ simplelist_debug=false;
     };
 
     /* Private methods */
-    function update_list(e, rows) {
+    function update_table(e, rows) {
+	// e.data is what we passed in second argument to subscribe
+	// so here it is the jquery object attached to the plugin <div>
+	var $this=e.data;
+	// locate the <tbody>, expected layout being
+	// <div class='plugin'> <table> <thead /> <tbody /tbody> </table> </div>
+	// -- or, if we don't have a header --
+	// <div class='plugin'> <table> <tbody /tbody> </table> </div>
+	var $tbody=$this.find("tbody.simplelist").first();
+	if (simplelist_debug) console.log("$tbody goes with "+$tbody.get(0));
+
         if (rows.length == 0) {
-            e.data.html('No result !');
+            $tbody.html("<tr><td class='simplelist-empty'>No result !</tr></td>");
             return;
         }
         if (typeof rows[0].error != 'undefined') {
-            e.data.html('ERROR: ' + rows[0].error);
+            e.data.html("<tr><td class='simplelist-error'>ERROR: " + rows[0].error + "</td></tr>");
             return;
         }
         var options = e.data.data().SimpleList.options;
         var is_cached = options.query.timestamp != 'now' ? true : false;
-	html_code=myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>";
-        e.data.html(html_code);
-	var $elt = e.data;
-	if (simplelist_debug) console.log("about to unspin with elt #" + $elt.attr('id') + " class " + $elt.attr('class'));
-	$elt.closest('.need-spin').spin(false);
+	// here is where we use 'key' and 'value' from the SimpleList (python) constructor
+	html_code=myslice_html_tbody(rows, options.key, options.value, is_cached);
+	// locate the tbody from the template, set its text
+        $tbody.html(html_code);
+
+	// clear the spinning wheel: look up an ancestor that has the need-spin class
+	$this.closest('.need-spin').spin(false);
+
+	// in case we run in datatables mode
+	// xxx this is not working yet
+	// http://datatables.net/forums/discussion/14556/can039t-get-my-table-to-refresh-properly#Item_1
+	// http://live.datatables.net/ufihuc/2/edit#javascript,html
+	// most likely when using datatables we'll have to change the contents using some other way..
+	var datatables_table=$this.find("table.with-datatables");
+	if (simplelist_debug) console.log ("running fnDraw() on " + datatables_table.length + " items");
+	// only try this if needed as datatables might not be loaded at all
+	if (datatables_table.length >0) datatables_table.dataTable().fnDraw();
+
     }
 
-    function myslice_html_ul(data, key, value, is_cached) {
-        var out = "<ul>";
+    function myslice_html_tbody(data, key, value, is_cached) {
+//	return $.map (...)
+        var out = "";
         for (var i = 0; i < data.length; i++) {
-            out += myslice_html_li(key, data[i][value], is_cached);
+            out += myslice_html_tr(key, data[i][value], is_cached);
         }
-        out += "</ul>";
         return out;
     }
     
-    function myslice_html_li(key, value) {
-        var cached = '';
+    function myslice_html_tr(key, value,is_cached) {
+// could not understand what sense this 'cache' stuff could actually make	
+//        var cached = is_cached ? "(cached)" : "";
+        var cached = "";
         if (key == 'slice_hrn') {
-            return "<li class='icn icn-play'><a href='/slice/" + value + "'>" + value + cached + "</a></li>";
+            return "<tr><td class='simplelist'><i class='icon-play-circle'></i><a href='/slice/" + value + "'>" + value + cached + "</a></td></tr>";
         } else if (key == 'network_hrn') {
-            return "<li class='icn icn-play'>" + value + cached + "</li>";
+            return "<tr><td class='simplelist'><i class='icon-play-circle'></i>" + value + cached + "</td></tr>";
         } else {
-            return "<li>" + value + "</li>";
+            return "<tr><td class='simplelist'>" + value + "</td></tr>";
         }
     }