From 6ee5cf51bf467560e4566b2b7bfa8e22dfff0784 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 11 Mar 2013 14:53:15 +0100
Subject: [PATCH] spin work OK with simplelist
---
engine/static/js/manifold-async.js | 29 ++++++++++++-------------
plugins/static/js/simplelist.js | 35 ++++++++++++++----------------
2 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/engine/static/js/manifold-async.js b/engine/static/js/manifold-async.js
index d6e46f69..75287b27 100644
--- a/engine/static/js/manifold-async.js
+++ b/engine/static/js/manifold-async.js
@@ -1,18 +1,15 @@
-manifold_async_debug=false;
+manifold_async_debug=true;
// Helper functions for asynchronous requests
var api_url = '/manifold/api/json/'
-// Executes all async. queries contained in manifold_async_query_array, which is
-// an array of hash (action, method, ts, filter, fields)
-//
-function manifold_async_exec(arr)
-{
- if (manifold_async_debug) console.log('manifold_async_exec length='+ arr.length);
+// Executes all async. queries
+// input queries are specified as a list of {'query': new Query(..), 'id': <possibly null>}
+function manifold_async_exec(queries) {
+ if (manifold_async_debug) console.log('manifold_async_exec length='+ queries.length);
// start spinners
- // xxx todo - I don't have the spinner jquery plugin yet
-// jQuery('.loading').spin();
+ jQuery('.plugin-toggle').spin();
// We use js function closure to be able to pass the query (array) to the
// callback function used when data is received
@@ -20,20 +17,22 @@ function manifold_async_exec(arr)
return function(data, textStatus) {manifold_async_success(data, query, id);}
};
- // Loop through query array and issue XML/RPC queries
- jQuery.each(arr, function(index, elt) {
- hash=elt.query.to_hash();
- if (manifold_async_debug) console.log ('sending POST on ' + api_url + " iterating on " + hash);
- jQuery.post(api_url, {'query': hash}, manifold_async_success_closure(elt.query, elt.id));
+ // Loop through query array and use ajax to send back queries (to frontend) with json
+ jQuery.each(queries, function(index, tuple) {
+ hash=tuple.query.to_hash();
+ if (manifold_async_debug) console.log ("sending POST on " + api_url + " iterating on " + tuple + " -> " + hash);
+ jQuery.post(api_url, {'query': hash}, manifold_async_success_closure(tuple.query, tuple.id));
})
}
+/*
function manifold_async_error(str) {
var out = '<div class="error"><h2>Error</h2><dl id="system-message"><dt class="error">Notice</dt><dd class="error message"><ul><li>' + jQuery('<div />').text(str).html() + '</li></ul></dd></dl></div>';
jQuery('#manifold_message').html(out);
//onObjectAvailable('Spinners', function(){ Spinners.get('.loading').remove(); }, this, true);
- jQuery('.loading').spin();
+ jQuery('.plugin-toggle').spin(false);
}
+*/
/* what the hell is this doing here ?
function apply_format(key, value, type, method) {
diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js
index 9c3752ba..f89aa2bf 100644
--- a/plugins/static/js/simplelist.js
+++ b/plugins/static/js/simplelist.js
@@ -17,18 +17,16 @@ simplelist_debug=false;
return this.each(function(){
var $this = $(this);
var data = $this.data('SimpleList');
-// console.log("data" + data);
-// looks like $this.attr('title') is undefined..
-// console.log('iterating in simplelist.init with data='+data+' and title='+$this.attr('title'));
/* create an empty DOM object */
var SimpleList = $('<div />', { text : $this.attr('title') });
// If the plugin hasn't been initialized yet
if ( ! data ) {
/* Subscribe to query updates */
- var url='/results/' + options.query_uuid + '/changed';
- $.subscribe(url, {instance: $this}, update_list);
- if (simplelist_debug) window.console.log('subscribing to ' + url);
- $this.data('SimpleList', {options: options, target : this, SimpleList : SimpleList});
+ var channel='/results/' + options.query_uuid + '/changed';
+ /* passing $this as 2nd arg: callbacks will retrieve $this as e.data */
+ $.subscribe(channel, $this, update_list);
+ if (simplelist_debug) window.console.log('subscribing to ' + channel);
+ $this.data('SimpleList', {options: options, SimpleList : SimpleList});
}
});
},
@@ -57,37 +55,36 @@ simplelist_debug=false;
/* Private methods */
function update_list(e, rows) {
if (rows.length == 0) {
- e.data.instance.html('No result !');
+ e.data.html('No result !');
return;
}
if (typeof rows[0].error != 'undefined') {
- e.data.instance.html('ERROR: ' + rows[0].error);
+ e.data.html('ERROR: ' + rows[0].error);
return;
}
- options = e.data.instance.data().SimpleList.options;
- is_cached = options.query.ts != 'now' ? true : false;
+ var options = e.data.data().SimpleList.options;
+ var is_cached = options.query.timestamp != 'now' ? true : false;
html_code=myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>";
- e.data.instance.html(html_code);
-
+ e.data.html(html_code);
+ var $elt = e.data;
+ if (simplelist_debug) console.log("about to unspin with elt #" + $elt.attr('id') + " class " + $elt.attr('class'));
+ $elt.closest('.plugin-toggle').spin(false);
}
function myslice_html_ul(data, key, value, is_cached) {
var out = "<ul>";
for (var i = 0; i < data.length; i++) {
out += myslice_html_li(key, data[i][value], is_cached);
- //out += myslice_html_li(key, myslice_html_a(data[i][key], data[i][value], key), is_cached);
}
out += "</ul>";
return out;
}
- function myslice_html_li(type, value, is_cached) {
+ function myslice_html_li(key, value) {
var cached = '';
- //if (is_cached)
- // cached='<div class="cache"><span><b>Cached information from the database</b><br/>Timestamp: XX/XX/XX XX:XX:XX<br/><br/><i>Refresh in progress...</i></span></div>';
- if (type == 'slice_hrn') {
+ if (key == 'slice_hrn') {
return "<li class='icn icn-play'><a href='/slice/" + value + "'>" + value + cached + "</a></li>";
- } else if (type == 'network_hrn') {
+ } else if (key == 'network_hrn') {
return "<li class='icn icn-play'>" + value + cached + "</li>";
} else {
return "<li>" + value + "</li>";
--
2.47.0