From: Anthony Garcia <anthony.garcia@inria.fr>
Date: Fri, 27 Sep 2013 09:34:56 +0000 (+0200)
Subject: fix 3dmap
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=06ee8dd75f09e7900dd33505788d8a15b60eed38

fix 3dmap
---

diff --git a/plugins/senslabmap/static/js/senslabmap.js b/plugins/senslabmap/static/js/senslabmap.js
index 68e2189c..eb3acd2c 100644
--- a/plugins/senslabmap/static/js/senslabmap.js
+++ b/plugins/senslabmap/static/js/senslabmap.js
@@ -9,8 +9,6 @@
       this.received_set = false;
       this.in_set_buffer = Array();
       
-      this.el().on('show', this, this.on_show);
-      
       var query = manifold.query_store.find_analyzed_query(options.query_uuid);
       this.method = query.object;
       
diff --git a/plugins/senslabmap/static/js/viewer3D.js b/plugins/senslabmap/static/js/viewer3D.js
index 1536921c..1e596dc6 100644
--- a/plugins/senslabmap/static/js/viewer3D.js
+++ b/plugins/senslabmap/static/js/viewer3D.js
@@ -24,14 +24,13 @@ var nodes = [];
 function init() {
   var particles, particle;
   
-  div3d = JQuery('#div3d');
-  nodebox = JQuery('#nodebox');
-  infobox = JQuery('#infobox');
-  titlebox = JQuery('#titlebox');
+  div3d = document.getElementById('div3d');
+  nodebox = document.getElementById('nodebox');
+  infobox = document.getElementById('infobox');
+  titlebox = document.getElementById('titlebox');
   
-  var offset = div3d.offset;
-  offY = div3d.top;
-  offX = div3d.left;
+  offY = div3d.offsetTop;
+  offX = div3d.offsetLeft;
   
   //titlebox.innerHTML = 'Grenoble Site ' + nodes.length + " nodes";
   infobox.innerHTML = 'Node info : ';
@@ -44,7 +43,7 @@ function init() {
   
   renderer = new THREE.CanvasRenderer();
   
-  div3d.append(renderer.domElement);
+  div3d.appendChild(renderer.domElement);
   
   window.addEventListener('resize', set3dsize, false);
   scene.add(camera);
@@ -116,11 +115,10 @@ function init() {
 }
 
 function set3dsize() {
-  var offset = div3d.offset;
-  offY = offset.top;
-  offX = offset.left;
-  window3DWidth = offset.width;
-  window3DHeight = offset.height;
+  offY = div3d.offsetTop;
+  offX = div3d.offsetLeft;
+  window3DWidth = div3d.offsetWidth;
+  window3DHeight = div3d.offsetHeight;
   renderer.setSize(window3DWidth, window3DHeight);
   
   camera.aspect = window3DWidth / window3DHeight;