Fix player detection

src/ext/lib/video-data/PlayerData.js

@@ -236,6 +236,7 @@ class PlayerData {
   getPlayer(isFullScreen) {
     const host = window.location.host;
     let element = this.video.parentNode;
+    const videoWidth = this.video.offsetWidth, videoHeight = this.video.offsetHeight;
 
     if(! element ){
       if(Debug.debug) {
@@ -274,18 +275,11 @@ class PlayerData {
       }
     }
 
+    const elementQ = [];
+    let scorePenalty = 0;
+    let score;
 
-    var trustCandidateAfterGrows = 2; // if candidate_width or candidate_height increases in either dimensions this many
+    while (element != undefined){    
-                                      // times, we say we found our player. (This number ignores weird elements)
-    // in case our <video> is bigger than player in one dimension but smaller in the other
-    // if site is coded properly, player can't be wider than that
-    var candidate_width = Math.max(element.offsetWidth, window.innerWidth);
-    var candidate_height = Math.max(element.offsetHeight, window.innerHeight);
-    var playerCandidateNode = element;
-
-    // if we haven't found element using fancy methods, we resort to the good old fashioned way
-    var grows = trustCandidateAfterGrows;
-    while(element != undefined){    
       // odstranimo čudne elemente, ti bi pokvarili zadeve
       // remove weird elements, those would break our stuff
       if ( element.offsetWidth == 0 || element.offsetHeight == 0){
@@ -293,40 +287,47 @@ class PlayerData {
         continue;
       }
   
-      if ( element.offsetHeight <= candidate_height &&
+      // element je player, če je ena stranica enako velika kot video, druga pa večja ali enaka. 
-           element.offsetWidth  <= candidate_width  ){
+      // za enakost dovolimo mala odstopanja
+      // element is player, if one of the sides is as long as the video and the other bigger (or same)
+      // we allow for tiny variations when checking for equality
+      if ( (element.offsetWidth >= videoWidth && this.equalish(element.offsetHeight, videoHeight, 2))
+           || (element.offsetHeight >= videoHeight && this.equalish(element.offsetWidth, videoHeight, 2))) {
         
-        // if we're in fullscreen, we only consider elements that are exactly as big as the monitor.
+        // todo — in case the match is only equalish and not exact, take difference into account when 
-        if( ! isFullScreen || 
+        // calculating score
-            (element.offsetWidth == window.innerWidth && element.offsetHeight == window.innerHeight) ){
         
-          playerCandidateNode = element;
+        score = 100;
-          candidate_width = element.offsetWidth;
+
-          candidate_height = element.offsetHeight;
+        if (element.id.indexOf('player') !== -1) { // prefer elements with 'player' in id
-        
+          score += 75;
-          grows = trustCandidateAfterGrows;
-        
-          if(Debug.debug){
-            console.log("Found new candidate for player. Dimensions: w:", candidate_width, "h:",candidate_height, "node:", playerCandidateNode);
-          }
         }
-      }
+        if (element.classList.toString().indexOf('player') !== -1) {  // prefer elements with 'player' in classlist, but a bit less than id
-      else if(grows --<= 0){
+          score += 50;
-        
-        if(Debug.debug && Debug.playerDetect){
-          console.log("Current element grew in comparrison to the child. We probably found the player. breaking loop, returning current result");
         }
-        break;
+        score -= scorePenalty++; // prefer elements closer to <video>
+        
+        elementQ.push({
+          element: element,
+          score: score,
+        });
       }
       
       element = element.parentNode;
     }
 
+    if (elementQ.length) {
+      // return biggest score
+      return elementQ.sort( (a,b) => b.score - a.score)[0];
+    }
 
-
+    // if no candidates were found, return parent node
-    return playerCandidateNode;
+    return this.video.parentNode;
   }
 
+  equalish(a,b, tolerance) {
+    return a > b - tolerance && a < b + tolerance;
+  }
 
   getPlayerDimensions(){
     const isFullScreen = PlayerData.isFullScreen();

src/ext/lib/video-data/VideoData.js

@@ -49,6 +49,7 @@ class VideoData {
     this.pageInfo.initMouseActionHandler(this);
 
     this.video.classList.add(this.userCssClassName); // this also needs to be applied BEFORE we initialize resizer!
+
   }
 
   onVideoDimensionsChanged(mutationList, observer) {
@@ -144,6 +145,8 @@ class VideoData {
       console.log(`[VideoData::destroy] <vdid:${this.vdid}> received destroy command`);
     }
 
+    this.video.classList.remove(this.userCssClassName);
+
     this.pause();
     this.destroyed = true;
     if (this.arDetector){