Merge branch 'master' of https://github.com/padagraph/botapadd

templates/botapadapp.html

@@ -308,6 +308,7 @@
           <link rel="import" href="{{static_host}}/static/padagraph-gviz-min.html">
           <dom-module id="graph-app">
             <template>
+              <div id="boo">
                 <padagraph-gviz-json sync="{{sync}}" routes="{{routes}}" data="{{data}}">
                   <padagraph-gviz options="{{options}}">
                     <div id="viz"></div>
@@ -339,9 +340,10 @@
                     </div>
                   </padagraph-gviz>
                 </padagraph-gviz-json>
+              </div>
             </template>
             <script>
-              require(['backbone', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, Cello, Gviz, Materials, Const ) {
+              require(['backbone', 'jquery', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, $, Cello, Gviz, Materials, Const ) {
                Polymer({
                 is: "graph-app",
               
@@ -388,11 +390,18 @@
               
                 
                 attached() {
-                  this.async( this.startapp );
+                  var start = this.startapp.bind(this);  
+                  this._observer =
+                      Polymer.dom(this.$.boo).observeNodes(function(info) {
+                       info.addedNodes.filter(function(node) {
+                        if (node.tagName === "PADAGRAPH-GVIZ-JSON")
+                          document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', start );
+                       });
+                  });
                 },
-                startapp() {
-                  this.toggle();
+                startapp(e) {
                   document.querySelector('padagraph-model-popup').hidden = true;
+                  this.toggle();
                   
                   var _window_resized = function(){
                       var e = document.getElementById('gviz');
@@ -413,9 +422,6 @@
                           element.classList.toggle("show");
                   };      
                   
-              
-                  document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', function (e) {
-              
                   console.log(e.detail.app); // true
                   var app = e.detail.app;
                   
@@ -446,7 +452,6 @@
                   $("#keb_settings").click( ()=>{ $("#keb").sidebar('show') } )
               
                   _window_resized();
-                  })
                 }
                })
               });

templates/graph.html

@@ -194,6 +194,7 @@
 <link rel="import" href="{{static_host}}/static/padagraph-gviz-min.html"/>
 <dom-module id="graph-app">
   <template>
+    <div id="boo">
       <padagraph-gviz-json sync="{{sync}}" routes="{{routes}}" data="{{data}}">
         <padagraph-gviz options="{{options}}">
           <div id="viz"></div>
@@ -225,9 +226,10 @@
           </div>
         </padagraph-gviz>
       </padagraph-gviz-json>
+    </div>
   </template>
   <script>
-    require(['backbone', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, Cello, Gviz, Materials, Const ) {
+    require(['backbone', 'jquery', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, $, Cello, Gviz, Materials, Const ) {
      Polymer({
       is: "graph-app",
     
@@ -274,11 +276,18 @@
     
       
       attached() {
-        this.async( this.startapp );
+        var start = this.startapp.bind(this);  
+        this._observer =
+            Polymer.dom(this.$.boo).observeNodes(function(info) {
+             info.addedNodes.filter(function(node) {
+              if (node.tagName === "PADAGRAPH-GVIZ-JSON")
+                document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', start );
+             });
+        });
       },
-      startapp() {
-        this.toggle();
+      startapp(e) {
         document.querySelector('padagraph-model-popup').hidden = true;
+        this.toggle();
         
         var _window_resized = function(){
             var e = document.getElementById('gviz');
@@ -299,9 +308,6 @@
                 element.classList.toggle("show");
         };      
         
-    
-        document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', function (e) {
-    
         console.log(e.detail.app); // true
         var app = e.detail.app;
         
@@ -332,7 +338,6 @@
         $("#keb_settings").click( ()=>{ $("#keb").sidebar('show') } )
     
         _window_resized();
-        })
       }
      })
     });

templates/graph.jade

@@ -201,7 +201,7 @@ link( rel="import" href="{{static_host}}/static/padagraph-gviz-min.html")
 
 dom-module(id='graph-app')
   template
-  
+   #boo
      padagraph-gviz-json( sync="{{sync}}" routes="{{routes}}" data="{{data}}" )
       padagraph-gviz( options="{{options}}")
         div#viz()
@@ -248,7 +248,7 @@ dom-module(id='graph-app')
               p Loading...
               
   script.
-    require(['backbone', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, Cello, Gviz, Materials, Const ) {
+    require(['backbone', 'jquery', 'cello', 'gviz', 'materials', 'pdgconst'], function (Backbone, $, Cello, Gviz, Materials, Const ) {
      Polymer({
       is: "graph-app",
 
@@ -295,11 +295,18 @@ dom-module(id='graph-app')
 
       
       attached() {
-        this.async( this.startapp );
+        var start = this.startapp.bind(this);  
+        this._observer =
+            Polymer.dom(this.$.boo).observeNodes(function(info) {
+             info.addedNodes.filter(function(node) {
+              if (node.tagName === "PADAGRAPH-GVIZ-JSON")
+                document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', start );
+             });
+        });
       },
-      startapp() {
-        this.toggle();
+      startapp(e) {
         document.querySelector('padagraph-model-popup').hidden = true;
+        this.toggle();
         
         var _window_resized = function(){
             var e = document.getElementById('gviz');
@@ -320,9 +327,6 @@ dom-module(id='graph-app')
                 element.classList.toggle("show");
         };      
         
-
-        document.querySelector('padagraph-gviz-json').addEventListener('engines-complete', function (e) {
-
         console.log(e.detail.app); // true
         var app = e.detail.app;
         
@@ -353,7 +357,6 @@ dom-module(id='graph-app')
         $("#keb_settings").click( ()=>{ $("#keb").sidebar('show') } )
 
         _window_resized();
-        })
       }
      })
     });