X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fstatic%2Fjs%2Fsimplelist.js;h=3d166a7c9f830b50dfe024e205ad607c3cb3ed77;hb=328c05636b6ff60608480ed8f3c2e1f4dae1f371;hp=2c05345eb2253cffefee7e8eded0697b32de4c78;hpb=3e10237eda530fdbe21b5b43b65b2bba9a28213c;p=unfold.git diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js index 2c05345e..3d166a7c 100644 --- a/plugins/static/js/simplelist.js +++ b/plugins/static/js/simplelist.js @@ -1,45 +1,44 @@ /** * MySlice SimpleList plugin - * Version: 0.1.0 - * URL: http://www.myslice.info + * URL: http://trac.myslice.info * Description: display simple lists like slices or testbeds - * Requires: * Author: The MySlice Team * Copyright (c) 2012 UPMC Sorbonne Universite - INRIA * License: GPLv3 */ -simplelist_debug=true; +simplelist_debug=false; +//simplelist_debug=true; (function($){ var methods = { init : function( options ) { return this.each(function(){ - var $this = $(this); - var data = $this.data('SimpleList'); - /* create an empty DOM object */ - var SimpleList = $('
', { text : $this.attr('title') }); + var $this = $(this), data = $this.data('SimpleList'); // If the plugin hasn't been initialized yet if ( ! data ) { /* Subscribe to query updates */ var channel='/results/' + options.query_uuid + '/changed'; /* passing $this as 2nd arg: callbacks will retrieve $this as e.data */ - $.subscribe(channel, $this, update_table); + $.subscribe(channel, $this, update_plugin); if (simplelist_debug) window.console.log('subscribing to ' + channel); - $this.data('SimpleList', {options: options, SimpleList : SimpleList}); + $this.data('SimpleList', {options: options}); } }); }, destroy : function( ) { + if (simplelist_debug) console.log("SimpleList.destroy..."); return this.each(function(){ var $this = $(this), data = $this.data('SimpleList'); + // xxx not too sure what this is about $(window).unbind('SimpleList'); - data.SimpleList.remove(); $this.removeData('SimpleList'); - }) - }, - update : function( content ) { } - }; + }); + }, + update : function( content ) { + if (simplelist_debug) console.log("SimpleList.update..."); + }, + }; // methods $.fn.SimpleList = function( method ) { /* Method calling logic */ @@ -53,67 +52,78 @@ simplelist_debug=true; }; /* Private methods */ - function update_table(e, rows) { + // complexity here is mostly because a datatables-enabled table cannot + // be updated in a "normal" way using .html() + function update_plugin(e, rows) { // e.data is what we passed in second argument to subscribe // so here it is the jquery object attached to the plugin
- var $this=e.data; - // locate the , expected layout being - //
- // -- or, if we don't have a header -- - //
- var $tbody=$this.find("tbody.simplelist").first(); - if (simplelist_debug) console.log("$tbody goes with "+$tbody.get(0)); + var $plugindiv=e.data; + // locate the element; with datatables in the way, + // this might not be a direct son of the div-plugin + var $table=$plugindiv.find("table.simplelist").first(); + // also we may or may not have a header + var $tbody=$table.find("tbody.simplelist").first(); + var use_datatables = $table.hasClass("with-datatables"); + if (simplelist_debug) console.log($plugindiv.attr('id') + " udt= " + use_datatables); + + // 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); if (rows.length == 0) { - $tbody.html(""); + if (use_datatables) datatables_set_message ("No result"); + else regular_set_message ("No result"); return; } if (typeof rows[0].error != 'undefined') { - e.data.html(""); + var error="ERROR: " + rows[0].error; + if (use_datatables) datatables_set_message (error); + else regular_set_message (error); return; } - var options = e.data.data().SimpleList.options; - var is_cached = options.query.timestamp != 'now' ? true : false; - // here is where we use 'key' and 'value' from the SimpleList (python) constructor - html_code=myslice_html_tbody(rows, options.key, options.value, is_cached); - // locate the tbody from the template, set its text - $tbody.html(html_code); - - // clear the spinning wheel: look up an ancestor that has the need-spin class - $this.closest('.need-spin').spin(false); - - // in case we run in datatables mode - // xxx this is not working yet - // http://datatables.net/forums/discussion/14556/can039t-get-my-table-to-refresh-properly#Item_1 - // http://live.datatables.net/ufihuc/2/edit#javascript,html - // most likely when using datatables we'll have to change the contents using some other way.. - var datatables_table=$this.find("table.with-datatables"); - if (simplelist_debug) console.log ("running fnDraw() on " + datatables_table.length + " items"); - // only try this if needed as datatables might not be loaded at all - if (datatables_table.length >0) datatables_table.dataTable().fnDraw(); + var options = $plugindiv.data().SimpleList.options; + if (use_datatables) datatables_update_table ($table,$tbody,rows,options.key); + else regular_update_table ($table,$tbody,rows,options.key); } - function myslice_html_tbody(data, key, value, is_cached) { -// return $.map (...) - var out = ""; - for (var i = 0; i < data.length; i++) { - out += myslice_html_tr(key, data[i][value], is_cached); - } - return out; - } - - function myslice_html_tr(key, value,is_cached) { -// could not understand what sense this 'cache' stuff could actually make -// var cached = is_cached ? "(cached)" : ""; - var cached = ""; + // hard-wire a separate presentation depending on the key being used.... + function cell(key, value) { if (key == 'slice_hrn') { - return ""; + return "" + value + ""; } else if (key == 'network_hrn') { - return ""; + return "" + value ; } else { - return ""; + return value; } } + + function regular_set_message ($table, $tbody, message) { + $tbody.html(""); + } + + function regular_update_table ($table, $tbody, rows, key) { + if (simplelist_debug) console.log('regular_update_table ' + rows.length + " rows"); + var html=$.map(rows, function (row) { return html_row ( cell (key, row[key])); }).join(); + $tbody.html(html); + } + + function datatables_set_message ($table, $tbody, message) { + $table.dataTable().fnClearTable(); + $table.dataTable().fnAddData( [ message ] ); + $table.dataTable().fnDraw(); + } + + function datatables_update_table ($table, $tbody, rows, key) { + if (simplelist_debug) console.log('datatables_update_table ' + rows.length + " rows"); + $table.dataTable().fnClearTable(); + // the lambda here returns a [[]] because $.map is kind of broken; as per the doc: + // The function can return any value to add to the array. A returned array will be flattened into the resulting array. + // this is wrong indeed so let's work around that + $table.dataTable().fnAddData( $.map(rows, function (row) { return [[ cell (key,row[key]) ]] }) ); + $table.dataTable().fnDraw(); + } + + function html_row (cell) { return ""; } })( jQuery );
No result !
ERROR: " + rows[0].error + "
" + value + cached + "
" + value + cached + "
" + value + "
"+message+"
"+cell+"