From d89d22bf3efa4cee1897668189f2deacf83bb19c Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 22 Mar 2013 13:24:08 +0100
Subject: [PATCH] various

---
 plugins/hazelnut/hazelnut.js   | 15 ++++++++-------
 plugins/querycode/querycode.js |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/plugins/hazelnut/hazelnut.js b/plugins/hazelnut/hazelnut.js
index 861f33c3..2709af92 100644
--- a/plugins/hazelnut/hazelnut.js
+++ b/plugins/hazelnut/hazelnut.js
@@ -53,9 +53,10 @@
                 var update_channel  = '/update-set/' + options.query_uuid;
                 var results_channel = '/results/' + options.query_uuid + '/changed';
 
-                $.subscribe(query_channel,  function(e, query) { hazelnut.set_query(query); });;
+                $.subscribe(query_channel,  function(e, query) { hazelnut.set_query(query); });
                 $.subscribe(update_channel, function(e, resources, instance) { hazelnut.set_resources(resources, instance); });
                 $.subscribe(results_channel, $this, function(e, rows) { hazelnut.update_plugin(e,rows); });
+		if (debug) console.log("hazelnut " + this.id + " subscribed to " + query_channel + " " + update_channel + " " + results_channel);
 
             }); // this.each
         }, // init
@@ -163,7 +164,7 @@
 
         this.set_query = function(query) {
 	    if (debug) console.log("entering set_query");
-            var o = this.options;
+            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 */
@@ -173,8 +174,8 @@
             // XXX ID naming has no plugin_uuid
             if (typeof(query.fields) != 'undefined') {        
                 $.each (query.fields, function(index, value) { 
-                    if (!$('#hazelnut-checkbox-' + o.plugin_uuid + "-" + value).attr('checked'))
-                        $('#hazelnut-checkbox-' + o.plugin_uuid + "-" + value).attr('checked', true);
+                    if (!$('#hazelnut-checkbox-' + options.plugin_uuid + "-" + value).attr('checked'))
+                        $('#hazelnut-checkbox-' + options.plugin_uuid + "-" + value).attr('checked', true);
                 });
             }
             /*Process updates in filters / current_query must be updated before this call for filtering ! */
@@ -217,15 +218,15 @@
 
         this.set_resources = function(resources, instance) {
 	    if (debug) console.log("entering set_resources");
-            var o = this.options;
+            var options = this.options;
             var previous_resources = this.current_resources;
             this.current_resources = resources;
     
             /* We uncheck all checkboxes ... */
-            $('hazelnut-checkbox-' + o.plugin_uuid).attr('checked', false);
+            $('hazelnut-checkbox-' + options.plugin_uuid).attr('checked', false);
             /* ... and check the ones specified in the resource list */
             $.each(this.current_resources, function(index, urn) {
-                $('#hazelnut-checkbox-' + o.plugin_uuid + "-" + urn).attr('checked', true)
+                $('#hazelnut-checkbox-' + options.plugin_uuid + "-" + urn).attr('checked', true)
             });
             
         }
diff --git a/plugins/querycode/querycode.js b/plugins/querycode/querycode.js
index 3574b30e..65c6d0dc 100644
--- a/plugins/querycode/querycode.js
+++ b/plugins/querycode/querycode.js
@@ -28,7 +28,7 @@
 
     var methods = {
 	init : function (options) {
-	    console.log("temporarily turned off SyntaxHighlighter ...");
+	    if (debug) console.log("temporarily turned off SyntaxHighlighter ...");
 //          SyntaxHighlighter.all();
 	    return this.each(function() {
 		var $this=$(this);
@@ -86,7 +86,7 @@
 	}
 	html_code=fun(query);
 	dom.html(html_code);
-	console.log("turned off SyntaxHighlighter.highlight");
+	if (debug) console.log("turned off SyntaxHighlighter.highlight");
 //	SyntaxHighlighter.highlight()
 
     }
-- 
2.43.0