various tweaks

diff --git a/manifold/js/manifold.js b/manifold/js/manifold.js
index 5765195..c773aed 100644 (file)
--- a/manifold/js/manifold.js
+++ b/manifold/js/manifold.js
@@ -13,7 +13,7 @@ function debug_value (msg, value) {
 function debug_query (msg, query) {
     if (query === undefined) console.log ("debug_query: " + msg + " -> undefined");
     else if (query == null) console.log ("debug_query: " + msg + " -> null");
-    else if ('query_uuid' in query) console.log ("debug_query: " + msg + " query_uuid= " + query.query_uuid);
+    else if ('query_uuid' in query) console.log ("debug_query: " + msg + query.__repr());
     else console.log ("debug_query: " + msg + " query= " + query);
 }
 

diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js
index 7600976..861f33c 100644 (file)
--- 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';
@@ -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();
 
@@ -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') {        
@@ -269,7 +270,6 @@
            // e.data is what we passed in second argument to subscribe
            // so here it is the jquery object attached to the plugin <div>
            var $plugindiv=e.data;
-           console.log("incoming plugindiv= " + $plugindiv);
            // 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);
@@ -367,7 +367,7 @@
          *
          * The current line should validate all filters
          */
-        $.each (cur_query.filter, function(index, filter) { 
+        $.each (cur_query.filters, function(index, filter) { 
             /* XXX How to manage checkbox ? */
             var key = filter[0]; 
             var op = filter[1];

diff --git a/plugins/hazelnut/hazelnut.py b/plugins/hazelnut/hazelnut.py
index c03f99c..f5dd324 100644 (file)
--- a/plugins/hazelnut/hazelnut.py
+++ b/plugins/hazelnut/hazelnut.py
@@ -22,7 +22,7 @@ class Hazelnut (Plugin):
     def requirements (self):
         reqs = {
             'js_files' : [ "js/hazelnut.js", 
-                           "js/manifold.js", "js/manifold-query.js",
+                           "js/manifold.js", "js/manifold-query.js", "js/manifold-core.js",
                            "js/dataTables.js", "js/with-datatables.js",
                            "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", 
                            "js/unfold-helper.js",

diff --git a/plugins/lists/simplelist.js b/plugins/lists/simplelist.js
index e883759..46534ce 100644 (file)
--- a/plugins/lists/simplelist.js
+++ b/plugins/lists/simplelist.js
@@ -27,15 +27,12 @@
        init : function( options ) {
            return this.each(function(){
                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_plugin);
-                   if (debug) window.console.log('subscribing to ' + channel);
-                   $this.data('SimpleList', options);
-               }
+               /* 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_plugin);
+               if (debug) window.console.log('subscribing to ' + channel);
+               $this.data('SimpleList', options);
            });
        },
        destroy : function( ) {