Merge branch 'assembla-9a3865327d' into 'white/integracion'

Fix top services modal bug Merged-on: https://assembla.com/code/faraday/git/merge_requests/5163773
infobyte · Jul 6, 2017 · e632c68 · e632c68
2 parents 85b5eb8 + 9a38653
commit e632c68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/server/www/scripts/d3/directives/bar.js b/server/www/scripts/d3/directives/bar.js
@@ -84,6 +84,10 @@ angular.module('faradayApp')
                     var colored = document.createElement('div');
                     colored.style = "background-color:" + d.color; // Color is safe (its value is in a whitelist)
                     colored.innerText = name;
+                    while (element.firstChild) {
+                        // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+                        element.removeChild(element.firstChild);
+                    }
                     element.appendChild(colored);
                     element.appendChild(document.createTextNode(d.value));
                 })

diff --git a/server/www/scripts/d3/directives/cake.js b/server/www/scripts/d3/directives/cake.js
@@ -104,6 +104,10 @@ angular.module('faradayApp')
                     var colored = document.createElement('div');
                     colored.style = "background-color:" + d.color; // Color is safe (its value is in a whitelist)
                     colored.innerText = d.key;
+                    while (element.firstChild) {
+                        // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+                        element.removeChild(element.firstChild);
+                    }
                     element.appendChild(colored);
                     element.appendChild(document.createTextNode(d.value));
                 })

diff --git a/server/www/scripts/d3/directives/treemap.js b/server/www/scripts/d3/directives/treemap.js
@@ -95,6 +95,10 @@ angular.module('faradayApp')
                   var colored = document.createElement('div');
                   colored.style = "background-color:" + d.color; // Color is safe (its value is in a whitelist)
                   colored.innerText = d.name;
+                  while (element.firstChild) {
+                      // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
+                      element.removeChild(element.firstChild);
+                  }
                   element.appendChild(colored);
                   element.appendChild(document.createTextNode(d.count));
               })