that was close - add weightsVisWrapperWrapper and fix reloading page inits

1 files changed, 17 insertions, 27 deletions

diff --git a/index.html b/index.html
index c750c2b..8f6bb35 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
             impress().init();
 
             d3.selectAll(".visContainer")[0].forEach(function(el) {
-                weightsWrapper.addPlaceholder(d3.select(el));
+                weightsWrapper.addPlaceholder(el.parentNode);
             });
             weightsWrapper.load("data/weights.json", function() {
                 weightsWrapper.reposition();
@@ -30,12 +30,12 @@
             sizeSlides();
         }, false);
 
+        /* responsive deck */
         function sizeSlides() {
             d3.selectAll(".slide")
                 .style("width", parseInt(window.innerWidth) * 0.9 + "px")
                 .style("height", parseInt(window.innerHeight) * 0.9 + "px");
         };
-
         window.addEventListener("resize", sizeSlides);
     </script>
 
@@ -52,22 +52,17 @@
                 <h2>Die Gewichte im Verlauf</h2>
             </div>
 
-            <div class="visContainer" style="width: 100%; height: 100%">
-            </div>
+            <div class="visContainer"></div>
 
             <script type="text/javascript">
-                (function() {
-                    var thisStep = document.currentScript.parentElement;
-                    document.addEventListener("impress:stepenter", function(e) {
-                        if (!weightsWrapper.ready || e.target != thisStep) return;
-                        weightsWrapper.openIn(d3.select(thisStep).select(".visContainer"));
+                new VisIntegrater(function(c) {
+                    weightsWrapper.afterLoad(function() {
+                        weightsWrapper.openIn(c);
                         weightsWrapper.animate(10, 10);
                     });
-                    document.addEventListener("impress:stepleave", function(e) {
-                        if (e.target != thisStep) return;
-                        weightsWrapper.remove(d3.select(thisStep).select(".visContainer"));
-                    });
-                }());
+                }, function(c) {
+                    weightsWrapper.remove(c);
+                });
             </script>
         </div>
 
@@ -76,22 +71,17 @@
                 <h2>Gewichte und Fehler</h2>
             </div>
 
-            <div class="visContainer" style="width: 100%; height: 100%">
-            </div>
+            <div class="visContainer"></div>
 
             <script type="text/javascript">
-                (function() {
-                    var thisStep = document.currentScript.parentElement;
-                    document.addEventListener("impress:stepenter", function(e) {
-                        if (!weightsWrapper.ready || e.target != thisStep) return;
-                        weightsWrapper.openIn(d3.select(thisStep).select(".visContainer"));
-                        weightsWrapper.animate(60, 1);
-                    });
-                    document.addEventListener("impress:stepleave", function(e) {
-                        if (e.target != thisStep) return;
-                        weightsWrapper.remove(d3.select(thisStep).select(".visContainer"));
+                new VisIntegrater(function(c) {
+                    weightsWrapper.afterLoad(function() {
+                        weightsWrapper.openIn(c);
+                        weightsWrapper.animate(10, 10);
                     });
-                }());
+                }, function(c) {
+                    weightsWrapper.remove(c);
+                });
             </script>
         </div>
     </div>