X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fstatic%2Fjs%2Fhazelnut.js;h=dbff4ce1081a50c53c15bde5dda65a96c8018eda;hb=a0636b9fc2e25428fb9e66c61c8ce85d1b35cc5b;hp=81cf1e2673324a054408d6f58a52f85aa95a09ad;hpb=594da4cb6ce34b734bd7d782dc7bd46eac174660;p=myslice.git

diff --git a/plugins/hazelnut/static/js/hazelnut.js b/plugins/hazelnut/static/js/hazelnut.js
index 81cf1e26..dbff4ce1 100644
--- a/plugins/hazelnut/static/js/hazelnut.js
+++ b/plugins/hazelnut/static/js/hazelnut.js
@@ -6,9 +6,8 @@
 
 (function($){
 
-    // TEMP
     var debug=false;
-    debug=true
+//    debug=true
 
     var Hazelnut = Plugin.extend({
 
@@ -154,7 +153,7 @@
             // Prefix id with plugin_uuid
             result += "<input";
             result += " class='hazelnut-checkbox'";
-            result += " id='" + this.id('checkbox', this.id_from_key(key, value)) + "'";
+            result += " id='" + this.flat_id(this.id('checkbox', value)) + "'";
             result += " name='" + key + "'";
             result += " type='checkbox'";
             result += " autocomplete='off'";
@@ -203,7 +202,7 @@
     
 	    // adding an array in one call is *much* more efficient
 	    // this.table.fnAddData(line);
-	    this.buffered_lines.push(line)
+	    this.buffered_lines.push(line);
 
         },
 
@@ -238,8 +237,7 @@
         set_checkbox: function(record, checked)
         {
             /* Default: checked = true */
-            if (typeof checked === 'undefined')
-                checked = true;
+            if (checked === undefined) checked = true;
 
             var key_value;
             /* The function accepts both records and their key */
@@ -257,11 +255,11 @@
             }
 
 
-            var checkbox_id = this.id('checkbox', this.id_from_key(this.key, key_value));
-            checkbox_id = '#' + checkbox_id.replace(/\./g, '\\.');
-
-            var element = $(checkbox_id, this.table.fnGetNodes());
-
+            var checkbox_id = this.flat_id(this.id('checkbox', key_value));
+            checkbox_id = '#' + checkbox_id;
+	    // using dataTables's $ to search also in nodes that are not currently displayed
+            var element = this.table.$(checkbox_id);
+	    if (debug) messages.debug("set_checkbox checked=" + checked + " id=" + checkbox_id + " matches=" + element.length);
             element.attr('checked', checked);
         },
 
@@ -306,11 +304,12 @@
         {
             if (this.received_all_query) {
 		// if the 'all' query has been dealt with already we may turn on the checkbox
+		if (debug) messages.debug("turning on checkbox for record "+record[this.key]);
                 this.set_checkbox(record, true);
 	    } else {
 		// otherwise we need to remember that and do it later on
+		if (debug) messages.debug ("Remembering record to check " + record[this.key]);
                 this.buffered_records_to_check.push(record);
-		console.log ("Remembering record to check " + record);
 	    }
         },
 
@@ -326,9 +325,9 @@
 
         on_query_done: function()
         {
-            if (this.received_all_query)
-                this.unspin();
             this.received_query = true;
+	    // unspin once we have received both
+            if (this.received_all_query && this.received_query) this.unspin();
         },
         
         on_field_state_changed: function(data)
@@ -368,21 +367,22 @@
 
         on_all_query_done: function()
         {
-            var self = this;
-            if (this.received_query) {
-                /* XXX needed ? XXX We uncheck all checkboxes ... */
-                $("[id^='datatables-checkbox-" + this.options.plugin_uuid +"']").attr('checked', false);
-
-                /* ... and check the ones specified in the resource list */
-                $.each(this.buffered_records_to_check, function(i, record) {
-                    self.set_checkbox(record, true);
-                });
-
-                this.unspin();
-            }
+	    if (debug) messages.debug("1-shot initializing dataTables content with " + this.buffered_lines.length + " lines");
 	    this.table.fnAddData (this.buffered_lines);
 	    this.buffered_lines=[];
+	    
+            var self = this;
+	    // if we've already received the slice query, we have not been able to set 
+	    // checkboxes on the fly at that time (dom not yet created)
+            $.each(this.buffered_records_to_check, function(i, record) {
+		if (debug) messages.debug ("delayed turning on checkbox " + i + " record= " + record);
+                self.set_checkbox(record, true);
+            });
+	    this.buffered_records_to_check = [];
+
             this.received_all_query = true;
+	    // unspin once we have received both
+            if (this.received_all_query && this.received_query) this.unspin();
 
         }, // on_all_query_done
 
@@ -485,6 +485,7 @@
             var self = e.data;
 
             // XXX this.value = key of object to be added... what about multiple keys ?
+	    if (debug) messages.debug("hazelnut click handler checked=" + this.checked + " hrn=" + this.value);
             manifold.raise_event(self.options.query_uuid, this.checked?SET_ADD:SET_REMOVED, this.value);
             //return false; // prevent checkbox to be checked, waiting response from manifold plugin api