cleanup

[unfold.git] / plugins / static / js / simplelist.js

diff --git a/plugins/static/js/simplelist.js b/plugins/static/js/simplelist.js
index 7bbe910..9c3752b 100644 (file)
--- a/plugins/static/js/simplelist.js
+++ b/plugins/static/js/simplelist.js
@@ -9,6 +9,8 @@
  * License: GPLv3
  */
 
+simplelist_debug=false;
+
 (function($){
     var methods = {
        init : function( options ) {
@@ -24,8 +26,8 @@
                if ( ! data ) {
                    /* Subscribe to query updates */
                    var url='/results/' + options.query_uuid + '/changed';
-                   $.subscribe(url, {instance: this}, update_list);
-                   window.console.log('subscribing to ' + url);
+                   $.subscribe(url, {instance: $this}, update_list);
+                   if (simplelist_debug) window.console.log('subscribing to ' + url);
                    $this.data('SimpleList', {options: options, target : this, SimpleList : SimpleList});
                }
            });
@@ -53,7 +55,6 @@
     };
 
     /* Private methods */
-
     function update_list(e, rows) {
         if (rows.length == 0) {
             e.data.instance.html('No result !');
@@ -65,16 +66,27 @@
         }
         options = e.data.instance.data().SimpleList.options;
         is_cached = options.query.ts != 'now' ? true : false;
-        e.data.instance.html(myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>");
+       html_code=myslice_html_ul(rows, options.key, options.value, is_cached)+"<br/>";
+        e.data.instance.html(html_code);
         
     }
 
+    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) {
         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') {
-            return "<li class='icn icn-play'><a href='/view/slice/" + value + "'>" + value + cached + "</a></li>";
+            return "<li class='icn icn-play'><a href='/slice/" + value + "'>" + value + cached + "</a></li>";
         } else if (type == 'network_hrn') {
             return "<li class='icn icn-play'>" + value + cached + "</li>";
         } else {
@@ -82,14 +94,4 @@
         }
     }
     
-    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;
-    }
-    
 })( jQuery );