borken worker

share/public/javascripts/worker.js

@@ -0,0 +1,12 @@
+importScripts( 'http://localhost:5000/javascripts/d3-3.5.6.js' );
+
+onmessage = function(event) {
+  var force = event.data.force;
+
+  for (var i = 0, n = Math.ceil(Math.log(0.001) / Math.log(1 - (1 - Math.pow(0.001, 1 / 300)))); i < n; ++i) {
+    postMessage({type: "tick", progress: i / n});
+    force.tick();
+  }
+
+  postMessage({type: "end", force: force});
+};

share/views/ajax/device/netmap.tt

@@ -3,6 +3,7 @@
 // custom resize function as there is no event to fire and we need
 // to react to the sidebar.
 $.getJSON('[% uri_for('/ajax/data/device/netmap') %]', {q: '[% params.q %]'}, function(data) {
+
   function resizeGraphContainer() {
     setTimeout(function(){
       var graph = jQuery('#netmap_pane');
@@ -12,7 +13,7 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]', {q: '[% params.q %]'}, fu
   }
 
   jQuery(document).ready(function() {
-      window.netmap_pane = netGobrechtsD3Force('netmap_pane')
+    window.netmap_pane = netGobrechtsD3Force()
       .debug(true)
       .lassoMode(true)
       .nodeEventToOpenLink('click')
@@ -23,10 +24,12 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]', {q: '[% params.q %]'}, fu
       .preventLabelOverlappingOnForceEnd(true)
       .showLinkDirection(false)
       .showSelfLinks(true)
-          .showLoadingIndicatorOnAjaxCall(true)
       .minZoomFactor(0.1)
       .maxZoomFactor(10);
 
+    // stop force
+    netmap_pane.inspect().main.force.stop();
+
     // center on our selected device
     netmap_pane.inspect().main.force.on('end.centernode', function() {
       var node = netmap_pane.nodeDataById( data['data']['centernode'] );
@@ -34,12 +37,37 @@ $.getJSON('[% uri_for('/ajax/data/device/netmap') %]', {q: '[% params.q %]'}, fu
       netmap_pane.inspect().main.force.on('end.centernode', null);
     });
 
-      jQuery('#nd_sidebar-toggle-img-in').on("click", resizeGraphContainer);
+    // disable the default ticker  
-      jQuery('#nd_sidebar-toggle-img-out').on("click", resizeGraphContainer);
+    netmap_pane.inspect().main.force.on('tick', function() {} );
-      jQuery(window).on("resize", resizeGraphContainer);
 
-      resizeGraphContainer();
+    // now start, but without a ticker
     netmap_pane.start(data);
+
+    var worker = new Worker( 'http://localhost:5000/javascripts/worker.js' );
+    console.log(netmap_pane.inspect().main.force);
+    worker.postMessage({force: netmap_pane.inspect().main.force});
+    worker.onmessage = function(event) {
+      switch (event.data.type) {
+        case "tick": return ticked(event.data);
+        case "end": return ended(event.data);
+      }
+    };
+
+    function ticked(data) {
+      var progress = data.progress;
+      console.log(100 * progress + "%");
+      //meter.style.width = 100 * progress + "%";
+    }
+
+    function ended(data) {
+      console.log( data );
+    }
+
+  //  jQuery('#nd_sidebar-toggle-img-in').on("click", resizeGraphContainer);
+  //  jQuery('#nd_sidebar-toggle-img-out').on("click", resizeGraphContainer);
+  //  jQuery(window).on("resize", resizeGraphContainer);
+  //  resizeGraphContainer();
+
   });
 });
 

share/views/layouts/main.tt

@@ -20,7 +20,7 @@
   <script type="text/javascript" src="[% uri_base %]/javascripts/bootstrap.min.js"></script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/underscore.min.js"></script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/jquery.qtip.min.js"></script>
-  <script type="text/javascript" src="[% uri_base %]/javascripts/d3.min.js"></script>
+  <script type="text/javascript" src="[% uri_base %]/javascripts/d3-3.5.6.js"></script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/d3-force.js"></script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/toastr.js"></script>
   <script type="text/javascript" src="[% uri_base %]/javascripts/jquery.floatThead.js"></script>