Finish cleaning out DOM (#413)

* finish cleaning out dom

* lint

ui/component/app/view.jsx

@@ -390,10 +390,14 @@ function App(props: Props) {
     }
 
     return () => {
-      // $FlowFixMe
+      try {
-      document.head.removeChild(script);
+        // $FlowFixMe
-      // $FlowFixMe
+        document.head.removeChild(script);
-      document.head.appendChild(cmpScript);
+        // $FlowFixMe
+        document.head.removeChild(cmpScript);
+      } catch (err) {
+        console.log(err);
+      }
     };
   }, []);
 

ui/component/viewers/videoViewer/internal/ads.js

@@ -57,6 +57,8 @@ function runAds(internalFeatureEnabled, allowPreRoll, player, embedded) {
 
   const videoElement = document.getElementsByClassName('vjs-tech')[0];
 
+  if (!videoElement) return;
+
   // height and width of player
   const height = videoElement.offsetHeight;
   const width = videoElement.offsetWidth;

ui/page/home/view.jsx

@@ -224,27 +224,10 @@ function HomePage(props: Props) {
 
               const styleSheet = document.createElement('style');
               styleSheet.type = 'text/css';
+              styleSheet.id = 'customAniviewStyling';
               styleSheet.innerText = styles;
               // $FlowFixMe
               document.head.appendChild(styleSheet);
-
-              // clonedCard.style.display = 'none';
-
-              let timeoutCount = 0;
-              // eslint-disable-next-line no-inner-declarations
-              function checkForAniview() {
-                const aniBoxDiv = document.getElementsByClassName('homepageAdContainer')[0].querySelector('#aniBox');
-
-                if (!aniBoxDiv) {
-                  timeoutCount += 100;
-                  if (timeoutCount < 500) {
-                    window.setTimeout(checkForAniview, 100);
-                  }
-                } else {
-                  clonedCard.style.display = 'block';
-                }
-              }
-              checkForAniview();
             }
           }
           checkFlag();

web/component/ads/view.jsx

@@ -32,6 +32,11 @@ type Props = {
   authenticated: boolean,
 };
 
+function removeIfExists(querySelector) {
+  const element = document.querySelector(querySelector);
+  if (element) element.remove();
+}
+
 function Ads(props: Props) {
   const {
     location: { pathname },
@@ -69,10 +74,19 @@ function Ads(props: Props) {
         return () => {
           // $FlowFixMe
           document.head.removeChild(script);
+
+          // clear aniview state to allow ad reload
           delete window.aniplayerPos;
           delete window.storageAni;
           delete window.__VIDCRUNCH_CONFIG_618bb4d28aac298191eec411__;
           delete window.__player_618bb4d28aac298191eec411__;
+
+          // clean DOM elements from ad related elements
+          removeIfExists('[src^="https://cdn.vidcrunch.com/618bb4d28aac298191eec411.js"]');
+          removeIfExists('[src^="https://player.aniview.com/script/6.1/aniview.js"]');
+          removeIfExists('[id^="AVLoaderaniplayer_vidcrunch"]');
+          removeIfExists('#av_css_id');
+          removeIfExists('#customAniviewStyling');
         };
       } catch (e) {}
     }