X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fhazelnut.js;h=2f7ec5ea1bb18333804716d2fadbdc4ca1256c17;hb=0c6de66411d990fcd28278ec396456203acef805;hp=861f33c33a25e0e0cf0e87985bd3a6c54d0fd28b;hpb=d36cb74e23439c1d0982a3a004c0bff486ca910f;p=unfold.git

diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js
index 861f33c3..2f7ec5ea 100644
--- a/plugins/hazelnut/hazelnut.js
+++ b/plugins/hazelnut/hazelnut.js
@@ -53,9 +53,10 @@
                 var update_channel  = '/update-set/' + options.query_uuid;
                 var results_channel = '/results/' + options.query_uuid + '/changed';
 
-                $.subscribe(query_channel,  function(e, query) { hazelnut.set_query(query); });;
+                $.subscribe(query_channel,  function(e, query) { hazelnut.set_query(query); });
                 $.subscribe(update_channel, function(e, resources, instance) { hazelnut.set_resources(resources, instance); });
                 $.subscribe(results_channel, $this, function(e, rows) { hazelnut.update_plugin(e,rows); });
+		if (debug) console.log("hazelnut '" + this.id + "' subscribed to e.g." + results_channel);
 
             }); // this.each
         }, // init
@@ -126,7 +127,8 @@
             // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2
             aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}],
             bRetrieve: true,
-            sScrollX: '100%',       /* Horizontal scrolling */
+	    // xxx this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty
+            // sScrollX: '100%',       /* Horizontal scrolling */
             bProcessing: true,      /* Loading */
             fnRowCallback: function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) {
                 $(nRow).attr('id', get_value(aData[3]));
@@ -146,9 +148,6 @@
         oSelectAll.unbind('click');
         oSelectAll.click(selectAll);
 
-        /* Spinner (could be done when the query is received = a query is in progress, also for update) */
-//        $('#' + options.plugin_uuid).spin()
-
         /* Add a filtering function to the current table 
          * Note: we use closure to get access to the 'options'
          */
@@ -162,19 +161,18 @@
         /* methods */
 
         this.set_query = function(query) {
-	    if (debug) console.log("entering set_query");
-            var o = this.options;
+            var options = this.options;
             /* Compare current and advertised query to get added and removed fields */
             previous_query = this.current_query;
             /* Save the query as the current query */
             this.current_query = query;
-	    if (debug) console.log("set_query, current_query is now -> " + this.current_query);
+	    if (debug) console.log("hazelnut.set_query, current_query is now -> " + this.current_query);
             /* We check all necessary fields : in column editor I presume XXX */
             // XXX ID naming has no plugin_uuid
             if (typeof(query.fields) != 'undefined') {        
                 $.each (query.fields, function(index, value) { 
-                    if (!$('#hazelnut-checkbox-' + o.plugin_uuid + "-" + value).attr('checked'))
-                        $('#hazelnut-checkbox-' + o.plugin_uuid + "-" + value).attr('checked', true);
+                    if (!$('#hazelnut-checkbox-' + options.plugin_uuid + "-" + value).attr('checked'))
+                        $('#hazelnut-checkbox-' + options.plugin_uuid + "-" + value).attr('checked', true);
                 });
             }
             /*Process updates in filters / current_query must be updated before this call for filtering ! */
@@ -216,16 +214,16 @@
         }
 
         this.set_resources = function(resources, instance) {
-	    if (debug) console.log("entering set_resources");
-            var o = this.options;
+	    if (debug) console.log("entering hazelnut.set_resources");
+            var options = this.options;
             var previous_resources = this.current_resources;
             this.current_resources = resources;
     
             /* We uncheck all checkboxes ... */
-            $('hazelnut-checkbox-' + o.plugin_uuid).attr('checked', false);
+            $('hazelnut-checkbox-' + options.plugin_uuid).attr('checked', false);
             /* ... and check the ones specified in the resource list */
             $.each(this.current_resources, function(index, urn) {
-                $('#hazelnut-checkbox-' + o.plugin_uuid + "-" + urn).attr('checked', true)
+                $('#hazelnut-checkbox-' + options.plugin_uuid + "-" + urn).attr('checked', true)
             });
             
         }
@@ -245,7 +243,7 @@
          * XXX will be removed/replaced
          */
         this.selected_changed = function(e, change) {
-	    if (debug) console.log("entering selected_changed");
+	    if (debug) console.log("entering hazelnut.selected_changed");
             var actions = change.split("/");
             if (actions.length > 1) {
                 var oNodes = this.table.fnGetNodes();
@@ -266,10 +264,10 @@
         }
     
         this.update_plugin = function(e, rows) {
-	    if (debug) console.log("entering update_plugin");
 	    // e.data is what we passed in second argument to subscribe
 	    // so here it is the jquery object attached to the plugin <div>
 	    var $plugindiv=e.data;
+	    if (debug) console.log("entering hazelnut.update_plugin on id '" + $plugindiv.attr('id') + "'");
 	    // clear the spinning wheel: look up an ancestor that has the need-spin class
 	    // do this before we might return
 	    $plugindiv.closest('.need-spin').spin(false);
@@ -278,13 +276,13 @@
             var hazelnut = this;
     
             if (rows.length==0) {
+		if (debug) console.l ("empty result");
                 this.table.html(errorDisplay("No Result"));   
                 return;
-            } else {
-                if (typeof(rows[0].error) != 'undefined') {
-                    this.table.html(errorDisplay(rows[0].error));
-                    return;
-                }
+            } else if (typeof(rows[0].error) != 'undefined') {
+		if (debug) console.log ("undefined result");
+                this.table.html(errorDisplay(rows[0].error));
+                return;
             }
             newlines = new Array();
     
@@ -332,10 +330,10 @@
     
             });
     
-//	    console.log ("end of each, newlines=" + newlines.length);
+	    this.table.fnClearTable();
+	    if (debug) console.log("hazelnut.update_plugin: total of " + newlines.length + " rows");
             this.table.fnAddData(newlines);
     
-//	    console.log (" exiting update_plugin = ");
         };
 
         this.checkbox = function (plugin_uuid, header, field, selected_str, disabled_str) {