X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhazelnut%2Fhazelnut.js;h=5f1c27a0068c26ef2a208f9bfbf07271247b4699;hb=e256853ef256809864927b91deb42e713baea769;hp=3a9335fa3695f7bab7cc91812fda236188d718fd;hpb=d8f20800f3709f4958493d2e1e1f8a8a98b0e29a;p=myslice.git diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js index 3a9335fa..5f1c27a0 100644 --- a/plugins/hazelnut/hazelnut.js +++ b/plugins/hazelnut/hazelnut.js @@ -12,7 +12,7 @@ (function($){ var debug=false; -// debug=true + debug=true // routing calls $.fn.Hazelnut = function( method ) { @@ -31,34 +31,52 @@ var methods = { + /** + * @brief Plugin initialization + * @param options : an associative array of setting values + * @return : a jQuery collection of objects on which the plugin is + * applied, which allows to maintain chainability of calls + */ init : function ( options ) { + /* Default settings */ var options = $.extend( { 'checkboxes': false }, options); return this.each(function() { + var $this = $(this); + /* Events */ $this.on('show.Datatables', methods.show); /* An object that will hold private variables and methods */ - var hazelnut = new Hazelnut (options); + var hazelnut = new Hazelnut (options); $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'; + // xxx not tested yet $.subscribe(query_channel, function(e, query) { hazelnut.set_query(query); }); + // xxx not tested yet $.subscribe(update_channel, function(e, resources, instance) { hazelnut.set_resources(resources, instance); }); + // expected to work $.subscribe(results_channel, $this, function(e, rows) { hazelnut.update_plugin(e,rows); }); - if (debug) messages.debug("hazelnut '" + this.id + "' subscribed to e.g." + results_channel); + if (debug) + messages.debug("hazelnut '" + this.id + "' subscribed to e.g." + results_channel); }); // this.each }, // init + /** + * @brief Plugin destruction + * @return : a jQuery collection of objects on which the plugin is + * applied, which allows to maintain chainability of calls + */ destroy : function( ) { + return this.each(function() { var $this = $(this); var hazelnut = $this.data('Hazelnut'); @@ -73,12 +91,13 @@ }, // destroy show : function( ) { - var $this=$(this); - // xxx wtf. why [1] ? would expect 0... - if (debug) messages.debug("Hitting suspicious line in hazelnut.show"); + var $this=$(this); + // xxx wtf. why [1] ? would expect 0... + if (debug) + messages.debug("Hitting suspicious line in hazelnut.show"); var oTable = $($('.dataTable', $this)[1]).dataTable(); oTable.fnAdjustColumnSizing() - + /* Refresh dataTabeles if click on the menu to display it : fix dataTables 1.9.x Bug */ $(this).each(function(i,elt) { if (jQuery(elt).hasClass('dataTables')) { @@ -93,42 +112,44 @@ }; // var methods; - /*************************************************************************** * Hazelnut object ***************************************************************************/ - function Hazelnut(options) { + + function Hazelnut(options) + { /* member variables */ this.options = options; - // xxx thierry : initialize this here - it was not, I expect this relied on set_query somehow.. + + // xxx thierry : initialize 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) messages.debug("Hazelnut constructor: have set current_query -> " + this.current_query); - this.query_update = null; + this.current_query=manifold.find_query(this.options.query_uuid); + // if (debug) messages.debug("Hazelnut constructor: have set current_query -> " + this.current_query.__repr()); + this.query_update = null; this.current_resources = Array(); var object = this; /* Transforms the table into DataTable, and keep a pointer to it */ - actual_options = { + actual_options = { // Customize the position of Datatables elements (length,filter,button,...) - // we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time - sDom: "<'row-fluid'<'span5'l><'span1'r><'span6'f>>t<'row-fluid'<'span5'i><'span7'p>>", + // we use a fluid row on top and another on the bottom, making sure we take 12 grid elt's each time + sDom: "<'row-fluid'<'span5'l><'span1'r><'span6'f>>t<'row-fluid'<'span5'i><'span7'p>>", sPaginationType: 'bootstrap', // Handle the null values & the error : Datatables warning Requested unknown parameter // http://datatables.net/forums/discussion/5331/datatables-warning-...-requested-unknown-parameter/p2 aoColumnDefs: [{sDefaultContent: '',aTargets: [ '_all' ]}], - // WARNING: this one causes tables in a 'tabs' that are not exposed at the time this is run to show up empty + // WARNING: 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 */ fnDrawCallback: function() { hazelnut_draw_callback.call(object, options); } }; - // the intention here is that options.datatables_options as coming from the python object take precedence - $.extend(actual_options, options.datatables_options ); + // the intention here is that options.datatables_options as coming from the python object take precedence + // XXX DISABLED by jordan: was causing errors in datatables.js $.extend(actual_options, options.datatables_options ); this.table = $('#hazelnut-' + options.plugin_uuid).dataTable(actual_options); /* Setup the SelectAll button in the dataTable header */ - /* xxx not sure this is still working */ + /* xxx not sure this is still working */ var oSelectAll = $('#datatableSelectAll-'+ options.plugin_uuid); oSelectAll.html("Select All"); oSelectAll.button(); @@ -152,12 +173,15 @@ /* methods */ this.set_query = function(query) { + messages.info('hazelnut.set_query'); 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) messages.debug("hazelnut.set_query, current_query is now -> " + this.current_query); + if (debug) + messages.debug("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') { @@ -166,7 +190,8 @@ $('#hazelnut-checkbox-' + options.plugin_uuid + "-" + value).attr('checked', true); }); } - /*Process updates in filters / current_query must be updated before this call for filtering ! */ + + /* Process updates in filters / current_query must be updated before this call for filtering ! */ this.table.fnDraw(); /* @@ -205,7 +230,8 @@ } this.set_resources = function(resources, instance) { - if (debug) messages.debug("entering hazelnut.set_resources"); + if (debug) + messages.debug("entering hazelnut.set_resources"); var options = this.options; var previous_resources = this.current_resources; this.current_resources = resources; @@ -234,7 +260,7 @@ * XXX will be removed/replaced */ this.selected_changed = function(e, change) { - if (debug) messages.debug("entering hazelnut.selected_changed"); + if (debug) messages.debug("entering hazelnut.selected_changed"); var actions = change.split("/"); if (actions.length > 1) { var oNodes = this.table.fnGetNodes(); @@ -255,85 +281,106 @@ } 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