X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fhazelnut.js;h=861f33c33a25e0e0cf0e87985bd3a6c54d0fd28b;hb=f5384e02bc928851ebdecfd36e58e0996e1b5d6c;hp=a3d24f991fda86092b76a4ced991e506890a70fe;hpb=983d645de131be9d82fa3bc4f53025a4501e6ea0;p=unfold.git diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js index a3d24f99..861f33c3 100644 --- a/plugins/hazelnut/hazelnut.js +++ b/plugins/hazelnut/hazelnut.js @@ -47,7 +47,6 @@ /* 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'; @@ -56,7 +55,7 @@ $.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); }); }); // this.each }, // init @@ -107,6 +106,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(); @@ -147,7 +147,7 @@ oSelectAll.click(selectAll); /* Spinner (could be done when the query is received = a query is in progress, also for update) */ - $('#' + options.plugin_uuid).spin() +// $('#' + options.plugin_uuid).spin() /* Add a filtering function to the current table * Note: we use closure to get access to the 'options' @@ -168,6 +168,7 @@ 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); /* We check all necessary fields : in column editor I presume XXX */ // XXX ID naming has no plugin_uuid if (typeof(query.fields) != 'undefined') { @@ -264,24 +265,18 @@ } } - /** - * @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 ""; - } - - this.update_table = function(rows) { - var o = this.options; - var object = this; + 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