X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=manifold%2Fstatic%2Fjs%2Fmanifold.js;h=877b69c88cd896c3bc78ab0e88f625f9cfb33c18;hb=5d1ad393e97322f88eeee28fe237d85a008cb3b3;hp=791e4cfce35feff7dafe44a6ad0eb0e8b67f9107;hpb=f0dee854c76a1b065550eff5989abff77e87cb32;p=myslice.git

diff --git a/manifold/static/js/manifold.js b/manifold/static/js/manifold.js
index 791e4cfc..877b69c8 100644
--- a/manifold/static/js/manifold.js
+++ b/manifold/static/js/manifold.js
@@ -347,17 +347,19 @@ var manifold = {
     // Executes all async. queries
     // input queries are specified as a list of {'query_uuid': <query_uuid>, 'id': <possibly null>}
     asynchroneous_exec : function (query_publish_dom_tuples) {
-        // start spinners
-
-        // in case the spin stuff was not loaded, let's make sure we proceed to the exit 
-        //try {
-        //    if (manifold.asynchroneous_debug) 
-        //   messages.debug("Turning on spin with " + jQuery(".need-spin").length + " matches for .need-spin");
-        //    jQuery('.need-spin').spin(manifold.spin_presets);
-        //} catch (err) { messages.debug("Cannot turn on spins " + err); }
+// start spinners - be robust if the spin stuff was not loaded for any reason
+// turned off because each plugin is responsible for doing that through on_query_in_progress
+//        try {
+//	    var subjects=$(".need-spin");
+//            if (manifold.asynchroneous_debug) {
+//		messages.debug("Turning on spin with " + subjects.length + " matches for .need-spin");
+//		$.map (subjects, function (subject) { messages.debug("need-spin: "+ subject.id);});
+//	    }
+//            subjects.spin(manifold.spin_presets);
+//        } catch (err) { messages.debug("Cannot turn on spins " + err); }
         
         // Loop through input array, and use publish_uuid to publish back results
-        jQuery.each(query_publish_dom_tuples, function(index, tuple) {
+        $.each(query_publish_dom_tuples, function(index, tuple) {
             var query=manifold.find_query(tuple.query_uuid);
             var query_json=JSON.stringify (query);
             var publish_uuid=tuple.publish_uuid;
@@ -373,8 +375,8 @@ var manifold = {
 
             // not quite sure what happens if we send a string directly, as POST data is named..
             // this gets reconstructed on the proxy side with ManifoldQuery.fill_from_POST
-            jQuery.post(manifold.proxy_url, {'json':query_json}, 
-			manifold.success_closure(query, publish_uuid, tuple.callback /*domid*/));
+            $.post(manifold.proxy_url, {'json':query_json}, 
+		   manifold.success_closure(query, publish_uuid, tuple.callback /*domid*/));
         })
     },
 
@@ -431,7 +433,7 @@ var manifold = {
         /* Publish an update announce */
         var channel="/results/" + query.query_uuid + "/changed";
         if (manifold.publish_result_debug) messages.debug(".. publish_result OLD API (3) " + channel);
-        jQuery.publish(channel, [result, query]);
+        $.publish(channel, [result, query]);
 
 	if (manifold.publish_result_debug) messages.debug(".. publish_result - END (4) q=" + query.__repr());
     },
@@ -451,7 +453,7 @@ var manifold = {
 	if (manifold.publish_result_debug) messages.debug (">>>>> publish_result_rec " + query.object);
         if (manifold.query_expects_unique_result(query)) {
             /* Also publish subqueries */
-            jQuery.each(query.subqueries, function(object, subquery) {
+            $.each(query.subqueries, function(object, subquery) {
                 manifold.publish_result_rec(subquery, result[0][object]);
                 /* TODO remove object from result */
             });
@@ -730,6 +732,7 @@ var manifold = {
             if (publish_uuid)
                 $.publish("/results/" + publish_uuid + "/failed", [data.code, data.description] );
 
+/* DEMO - Debug Messages desactivated
             $("#notifications").notify("create", "sticky", {
               title: 'Warning',
               text: data.description
@@ -737,7 +740,7 @@ var manifold = {
               expires: false,
               speed: 1000
             });
-            
+*/
         }
 	if (manifold.asynchroneous_debug) 
 	    messages.debug ("========== asynchroneous_success " + query.object + " -- before process_query_records");
@@ -904,8 +907,10 @@ var manifold = {
                 manifold.run_query(query_ext.main_query_ext.update_query_ext.query);
                 break;
 
-            case FILTER_ADDED:
-                manifold.raise_query_event(query_uuid, event_type, value);
+            case FILTER_ADDED: 
+// Thierry - this is probably wrong but intended as a hotfix 
+// http://trac.myslice.info/ticket/32
+//                manifold.raise_query_event(query_uuid, event_type, value);
                 break;
             case FILTER_REMOVED:
                 manifold.raise_query_event(query_uuid, event_type, value);