Fixes for DOM exceptions when adding/removing nodes

radiant-player · Apr 12, 2014 · 23c9806 · 23c9806
1 parent 351fca4
commit 23c9806
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/google-music-mac/js/appbar.js b/google-music-mac/js/appbar.js
@@ -18,8 +18,7 @@ if (typeof window.GMAppBar === 'undefined') {
     exclude.push(document.querySelector('#gm-back'));
     exclude.push(document.querySelector('#gm-forward'));
     exclude.push(document.querySelector('#oneGoogleWrapper input[name="q"]').parentNode);
-    exclude.push(document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:first-child > div:first-child'));
-    exclude.concat(document.querySelectorAll('#oneGoogleWrapper > div:first-child > div:first-child > div:first-child > div:nth-child(2) > div > div:first-child'));
+    exclude.concat(document.querySelectorAll('#oneGoogleWrapper > div:first-child > div:first-child > div:first-child > div'));
 
     var appBar = document.querySelector('#oneGoogleWrapper');
 

diff --git a/google-music-mac/js/lastfm.js b/google-music-mac/js/lastfm.js
@@ -17,10 +17,6 @@ if (typeof window.LastFmButton === 'undefined') {
 
     // Obtain the area on the top-right, containing the Google account information.
     var rightArea = document.querySelector('#oneGoogleWrapper > div:first-child > div:first-child > div:first-child');
-
-    //// Remove all of the children.
-    //while (rightArea.childNodes.length)
-    //    rightArea.removeChild(rightArea.childNodes[0]);
 
     // Remove the +Google name in the top-right area.
     if (rightArea.childNodes.length)

diff --git a/google-music-mac/js/styles.js b/google-music-mac/js/styles.js
@@ -36,7 +36,7 @@ if (typeof window.Styles === 'undefined') {
         },
 
         removeStyle: function(key) {
-            if (Styles.appliedStyles[key]) {
+            if (Styles.appliedStyles[key] && Styles.appliedStyles[key].parentNode) {
                 Styles.appliedStyles[key].parentNode.removeChild(Styles.appliedStyles[key]);
                 delete Styles.appliedStyles[key];
             }