some cleanup in debug messages for googlemap and querytable

attempt to catch more events (for when switching tabs) but to no avail so far

diff --git a/plugins/googlemap/static/js/googlemap.js b/plugins/googlemap/static/js/googlemap.js
index 764f1b4..91ece99 100644 (file)
--- a/plugins/googlemap/static/js/googlemap.js
+++ b/plugins/googlemap/static/js/googlemap.js
@@ -38,10 +38,11 @@
            this.by_id = {};
            this.by_init_id = {};
 
-            /* XXX Events */
+            /* Events */
+           // xx somehow non of these triggers at all for now
             this.elmt().on('show', this, this.on_show);
-            // TODO in destructor
-            // $(window).unbind('QueryTable');
+            this.elmt().on('shown.bs.tab', this, this.on_show);
+            this.elmt().on('resize', this, this.on_resize);
 
             var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
             this.object = query.object;
@@ -76,7 +77,11 @@
            if (debug) messages.debug("googlemap.on_show");
             var googlemap = e.data;
             google.maps.event.trigger(googlemap.map, 'resize');
-        }, // on_show
+        }, 
+       // dummy to see if this triggers at all
+        on_resize: function(e) {
+           if (debug) messages.debug("googlemap.on_resize ...");
+        }, 
 
         /* GUI EVENTS */
 
@@ -95,8 +100,7 @@
             }
            
             var domid = this.options.plugin_uuid + '--' + 'googlemap';
-               var elmt = document.getElementById(domid);
-               if (debug) messages.debug("gmap.initialize_map based on  domid=" + domid + " elmt=" + elmt);
+           var elmt = document.getElementById(domid);
             this.map = new google.maps.Map(elmt, myOptions);
             this.infowindow = new google.maps.InfoWindow();
         }, // initialize_map
@@ -203,7 +207,7 @@
 
         /*************************** RECORD HANDLER ***************************/
         on_new_record: function(record) {
-           if (debug_deep) messages.debug("on_new_record");
+           if (debug_deep) messages.debug("googlemap.on_new_record");
             if (this.received_all)
                 // update checkbox for record
                 this.set_checkbox_from_record(record, true);
@@ -213,17 +217,17 @@
         },
 
         on_clear_records: function(record) {
-           if (debug_deep) messages.debug("on_clear_records");
+           if (debug_deep) messages.debug("googlemap.on_clear_records");
         },
 
         // Could be the default in parent
         on_query_in_progress: function() {
-           if (debug) messages.debug("on_query_in_progress (spinning)");
+           if (debug) messages.debug("googlemap.on_query_in_progress (spinning)");
             this.spin();
         },
 
         on_query_done: function() {
-               if (debug) messages.debug("on_query_done");         
+               if (debug) messages.debug("googlemap.on_query_done");       
             if (this.received_all) {
                 this.unspin();
                }
@@ -231,7 +235,7 @@
         },
 
         on_field_state_changed: function(data) {
-           if (debug_deep) messages.debug("on_field_state_changed");       
+           if (debug_deep) messages.debug("googlemap.on_field_state_changed");     
             switch(data.request) {
             case FIELD_REQUEST_ADD:
             case FIELD_REQUEST_ADD_RESET:
@@ -250,22 +254,22 @@
         // all : this 
 
         on_all_new_record: function(record) {
-           if (debug_deep) messages.debug("on_all_new_record");
+           if (debug_deep) messages.debug("googlemap.on_all_new_record");
             this.new_record(record);
         },
 
         on_all_clear_records: function() {
-           if (debug) messages.debug("on_all_clear_records");      
+           if (debug) messages.debug("googlemap.on_all_clear_records");            
         },
 
         on_all_query_in_progress: function() {
-           if (debug) messages.debug("on_all_query_in_progress (spinning)");
+           if (debug) messages.debug("googlemap.on_all_query_in_progress (spinning)");
             // XXX parent
             this.spin();
         },
 
         on_all_query_done: function() {
-           if (debug) messages.debug("on_all_query_done");
+           if (debug) messages.debug("googlemap.on_all_query_done");
 
             // MarkerClusterer
             var markers = [];
@@ -294,8 +298,6 @@
                 });
                // reset 
                googlemap.in_set_backlog = [];
-
-               if (debug) messages.debug("unspinning");
                 this.unspin();
             }
             this.received_all = true;

diff --git a/plugins/querytable/static/js/querytable.js b/plugins/querytable/static/js/querytable.js
index 935c087..bcb8192 100644 (file)
--- a/plugins/querytable/static/js/querytable.js
+++ b/plugins/querytable/static/js/querytable.js
@@ -31,12 +31,11 @@
            // an internal buffer for keeping lines and display them in one call to fnAddData
            this.buffered_lines = [];
 
-            /* XXX Events XXX */
-            // this.$element.on('show.Datatables', this.on_show);
+            /* Events */
+           // xx somehow non of these triggers at all for now
             this.elmt().on('show', this, this.on_show);
-            // Unbind all events using namespacing
-            // TODO in destructor
-            // $(window).unbind('QueryTable');
+            this.elmt().on('shown.bs.tab', this, this.on_show);
+            this.elmt().on('resize', this, this.on_resize);
 
             var query = manifold.query_store.find_analyzed_query(this.options.query_uuid);
             this.object = query.object;
@@ -69,25 +68,17 @@
 
         /* PLUGIN EVENTS */
 
-        on_show: function(e)
-        {
+        on_show: function(e) {
+           if (debug) messages.debug("querytable.on_show");
             var self = e.data;
+            self.table.fnAdjustColumnSizing();
+       },        
 
-            self.table.fnAdjustColumnSizing()
-        
-            /* Refresh dataTabeles if click on the menu to display it : fix dataTables 1.9.x Bug */        
-            /* temp disabled... useful ? -- jordan
-            $(this).each(function(i,elt) {
-                if (jQuery(elt).hasClass('dataTables')) {
-                    var myDiv=jQuery('#querytable-' + this.id).parent();
-                    if(myDiv.height()==0) {
-                        var oTable=$('#querytable-' + this.id).dataTable();            
-                        oTable.fnDraw();
-                    }
-                }
-            });
-            */
-        }, // on_show
+        on_resize: function(e) {
+           if (debug) messages.debug("querytable.on_resize");
+            var self = e.data;
+            self.table.fnAdjustColumnSizing();
+       },        
 
         /* GUI EVENTS */
 
@@ -178,7 +169,6 @@
             result += " class='querytable-checkbox'";
         // compute id from canonical_key
            var id = record[this.canonical_key]
-//         if (debug) messages.debug("checkbox_html, id="+id);
         // compute init_id form init_key
            var init_id=record[this.init_key];
         // set id - for retrieving from an id, or for posting events upon user's clicks
@@ -271,7 +261,7 @@
        set_checkbox_from_record: function (record, checked) {
             if (checked === undefined) checked = true;
            var init_id = record[this.init_key];
-           if (debug) messages.debug("set_checkbox_from_record, init_id="+init_id);
+           if (debug) messages.debug("querytable.set_checkbox_from_record, init_id="+init_id);
            // using table.$ to search inside elements that are not visible
            var element = this.table.$('[init_id="'+init_id+'"]');
            element.attr('checked',checked);
@@ -280,7 +270,7 @@
        // id relates to canonical_key
        set_checkbox_from_data: function (id, checked) {
             if (checked === undefined) checked = true;
-           if (debug) messages.debug("set_checkbox_from_data, id="+id);
+           if (debug) messages.debug("querytable.set_checkbox_from_data, id="+id);
            // using table.$ to search inside elements that are not visible
            var element = this.table.$("[id='"+id+"']");
            element.attr('checked',checked);
@@ -369,8 +359,6 @@
                // if the 'all' query has been dealt with already we may turn on the checkbox
                 this.set_checkbox_from_record(record, true);
             } else {
-               // otherwise we need to remember that and do it later on
-               if (debug) messages.debug("Remembering record to check " + record[this.init_key]);
                 this.buffered_records_to_check.push(record);
             }
         },
@@ -453,7 +441,7 @@
            // if we've already received the slice query, we have not been able to set 
            // checkboxes on the fly at that time (dom not yet created)
             $.each(this.buffered_records_to_check, function(i, record) {
-               if (debug) messages.debug ("delayed turning on checkbox " + i + " record= " + record);
+               if (debug) messages.debug ("querytable delayed turning on checkbox " + i + " record= " + record);
                 self.set_checkbox_from_record(record, true);
             });
            this.buffered_records_to_check = [];