Merge branch 'graphDestroy' into development

johnnyflinn · Feb 21, 2016 · 8d15c9f · 8d15c9f
2 parents a2789d3 + 019f8f7
commit 8d15c9f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/dst/ngCytoscape.js b/dst/ngCytoscape.js
@@ -95,6 +95,10 @@
              cy.ready(function() {
                 cytoData.setGraph(cy, attrs.id);
             });
+            scope.$on('$destroy', function(){
+                cy.destroy();
+                cytoData.unresolveGraph(attrs.id)
+            })
 
         }
     }
@@ -244,6 +248,11 @@
         _private.Graph = {};
         var self = this;
 
+        self.unresolveGraph = function(graphId){
+            var id = cytoHelpers.obtainEffectiveGraphId(_private.Graph, graphId);
+            _private['Graph'][id] = undefined;
+        };
+
         self.setGraph = function(gObject, scopeId) {
             var defer = getUnresolvedDefer(_private.Graph, scopeId);
             defer.resolve(gObject);
@@ -280,7 +289,6 @@
                 graph.remove(graph.elements());
                 return;
             }
-            //Add All Elements
             if(graph.elements().length === 0){
                 angular.forEach(newEles, function(ele,index){
                     if(isValidElement(ele,index)){

diff --git a/dst/ngCytoscape.min.js b/dst/ngCytoscape.min.js
diff --git a/src/directives/cytoscape-directive.js b/src/directives/cytoscape-directive.js
@@ -95,6 +95,10 @@
              cy.ready(function() {
                 cytoData.setGraph(cy, attrs.id);
             });
+            scope.$on('$destroy', function(){
+                cy.destroy();
+                cytoData.unresolveGraph(attrs.id)
+            })
 
         }
     }

diff --git a/src/services/cytoData.js b/src/services/cytoData.js
@@ -13,6 +13,11 @@
         _private.Graph = {};
         var self = this;
 
+        self.unresolveGraph = function(graphId){
+            var id = cytoHelpers.obtainEffectiveGraphId(_private.Graph, graphId);
+            _private['Graph'][id] = undefined;
+        };
+
         self.setGraph = function(gObject, scopeId) {
             var defer = getUnresolvedDefer(_private.Graph, scopeId);
             defer.resolve(gObject);