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

diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js
index c264065a..2f7ec5ea 100644
--- a/plugins/hazelnut/hazelnut.js
+++ b/plugins/hazelnut/hazelnut.js
@@ -47,16 +47,16 @@
 
                 /* An object that will hold private variables and methods */
 		var hazelnut = new Hazelnut (options);
-		if (debug) console.log("Hazelnut object created");
                 $(this).data('Hazelnut', hazelnut);
 
                 var query_channel   = '/query/' + options.query_uuid + '/changed';
                 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, function(e, rows) { hazelnut.update_table(rows); });
+                $.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
@@ -107,6 +107,7 @@
 	// xxx thierry : init this here - it was not, I expect this relied on set_query somehow..
         //this.current_query = null;
 	this.current_query=manifold.find_query(this.options.query_uuid);
+	if (debug) console.log("Hazelnut constructor: have set current_query -> " + this.current_query);
 	this.query_update = null;
         this.current_resources = Array();
 
@@ -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,11 +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()
-
-	if (debug) console.log ("bing 005");
-
         /* Add a filtering function to the current table 
          * Note: we use closure to get access to the 'options'
          */
@@ -161,24 +158,21 @@
             return hazelnut_filter.call(object, oSettings, aData, iDataIndex);
         });
 
-	if (debug) console.log ("bing 010");
-
-
         /* 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("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 ! */
@@ -220,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)
             });
             
         }
@@ -249,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();
@@ -269,32 +263,26 @@
             }
         }
     
-        /**
-         * @brief
-         * @param plugin_uuid
-         * @param header
-         * @param field 
-         * @param selected_str
-         * @param disabled_str
-         */
-        this.checkbox = function(plugin_uuid, header, field, selected_str, disabled_str) {
-            /* Prefix id with plugin_uuid */
-            return "<input class='hazelnut-checkbox-" + plugin_uuid + "' id='hazelnut-checkbox-" + plugin_uuid + "-" + get_value(header) + "' name='" + get_value(field) + "' type='checkbox' " + selected_str + disabled_str + "autocomplete='off' value='" + get_value(header) + "'></input>";
-        }
+        this.update_plugin = function(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 $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);
+
+            var options = this.options;
+            var hazelnut = this;
     
-        this.update_table = function(rows) {
-            var o = this.options;
-            var object = this;
-    
-            $('#' + o.plugin_uuid).spin(false)
             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();
     
@@ -305,10 +293,10 @@
     
                 // go through table headers to get column names we want
                 // in order (we have temporarily hack some adjustments in names)
-                var cols = object.table.fnSettings().aoColumns;
+                var cols = hazelnut.table.fnSettings().aoColumns;
                 var colnames = cols.map(function(x) {return x.sTitle})
                 var nb_col = colnames.length;
-                if (o.checkboxes)
+                if (options.checkboxes)
                     nb_col -= 1;
                 for (var j = 0; j < nb_col; j++) {
                     if (typeof colnames[j] == 'undefined') {
@@ -327,14 +315,14 @@
                     }
                 }
     
-                if (o.checkboxes) {
+                if (options.checkboxes) {
                     var checked = '';
                     if (typeof(obj['sliver']) != 'undefined') { /* It is equal to null when <sliver/> is present */
                         checked = 'checked ';
-                        object.current_resources.push(obj['urn']);
+                        hazelnut.current_resources.push(obj['urn']);
                     }
                     // Use a key instead of hostname (hard coded...)
-                    newline.push(object.checkbox(o.plugin_uuid, obj['urn'], obj['type'], checked, false));
+                    newline.push(hazelnut.checkbox(options.plugin_uuid, obj['urn'], obj['type'], checked, false));
                 }
     
                 newlines.push(newline);
@@ -342,10 +330,22 @@
     
             });
     
+	    this.table.fnClearTable();
+	    if (debug) console.log("hazelnut.update_plugin: total of " + newlines.length + " rows");
             this.table.fnAddData(newlines);
     
-        }
-    }
+        };
+
+        this.checkbox = function (plugin_uuid, header, field, selected_str, disabled_str) {
+	    var result="";
+            /* Prefix id with plugin_uuid */
+	    result += "<input class='hazelnut-checkbox-" + plugin_uuid + "' id='hazelnut-checkbox-" + plugin_uuid + "-" + get_value(header) + "'";
+	    result += " name='" + get_value(field) + "' type='checkbox' " + selected_str + disabled_str + " autocomplete='off' value='" + get_value(header) + "'";
+	    result +="></input>";
+	    return result;
+        };
+    } // constructor
+
     /***************************************************************************
      * Private methods
      ***************************************************************************/
@@ -365,7 +365,7 @@
          *
          * The current line should validate all filters
          */
-        $.each (cur_query.filter, function(index, filter) { 
+        $.each (cur_query.filters, function(index, filter) { 
             /* XXX How to manage checkbox ? */
             var key = filter[0]; 
             var op = filter[1];
@@ -409,13 +409,13 @@
     }
 
     function hazelnut_draw_callback() {
-        var o = this.options;
+        var options = this.options;
         /* 
          * Handle clicks on checkboxes: reassociate checkbox click every time
          * the table is redrawn 
          */
-        $('.hazelnut-checkbox-' + o.plugin_uuid).unbind('click');
-        $('.hazelnut-checkbox-' + o.plugin_uuid).click({instance: this}, check_click);
+        $('.hazelnut-checkbox-' + options.plugin_uuid).unbind('click');
+        $('.hazelnut-checkbox-' + options.plugin_uuid).click({instance: this}, check_click);
 
         if (!this.table)
             return;