Merge pull request #700 from ashkanhosseini/master

fix #684 memory leaks issues after destroy.
sampotts · Nov 4, 2017 · 650ee2c · 650ee2c
2 parents b3759e9 + 7234e2f
commit 650ee2c
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/js/plyr.js b/src/js/plyr.js
@@ -519,11 +519,11 @@
     }
 
     // Unbind event
-    /*function _off(element, events, callback, useCapture) {
+    function _off(element, events, callback, useCapture) {
         if (element) {
             _toggleListener(element, events, callback, false, useCapture);
         }
-    }*/
+    }
 
     // Trigger event
     function _event(element, type, bubbles, properties) {
@@ -2931,6 +2931,10 @@
             }
         }
 
+        function onBodyClick() {
+            _toggleClass(_getElement('.' + config.classes.tabFocus), config.classes.tabFocus, false);
+        }
+
         // Listen for control events
         function _controlListeners() {
             // IE doesn't support input event, so we fallback to change
@@ -3145,9 +3149,7 @@
                     checkTabFocus(focused);
                 }
             });
-            _on(document.body, "click", function() {
-                _toggleClass(_getElement("." + config.classes.tabFocus), config.classes.tabFocus, false);
-            });
+            _on(document.body, "click", onBodyClick);
             for (var button in plyr.buttons) {
                 var element = plyr.buttons[button];
 
@@ -3429,9 +3431,15 @@
                 // Replace the container with the original element provided
                 plyr.container.parentNode.replaceChild(original, plyr.container);
 
+                // Free container in order for GC to remove it and prevent memory leaks due to added events
+                plyr.container = null;
+
                 // Allow overflow (set on fullscreen)
                 document.body.style.overflow = "";
 
+                //remove events
+                _off(document.body, 'click', onBodyClick);
+
                 // Event
                 _triggerEvent(original, "destroyed", true);
             }