Extract videoController definition, scope to video's ownerDocument.

inject.js

@@ -33,12 +33,10 @@ chrome.extension.sendMessage({}, function(response) {
     }
   );
 
-  function initializeVideoSpeed() {
+  function defineVideoController() {
-    if (document.readyState === 'complete') {
-      clearInterval(readyStateCheckInterval);
-
     tc.videoController = function(target) {
       this.video = target;
+      this.document = target.ownerDocument;
       if (!tc.settings.rememberSpeed) {
         tc.settings.speed = 1.0;
       }
@@ -70,16 +68,16 @@ chrome.extension.sendMessage({}, function(response) {
     }
 
     tc.videoController.prototype.initializeControls = function() {
-        var fragment = document.createDocumentFragment();
+      var fragment = this.document.createDocumentFragment();
-        var container = document.createElement('div');
+      var container = this.document.createElement('div');
-        var speedIndicator = document.createElement('span');
+      var speedIndicator = this.document.createElement('span');
 
-        var controls = document.createElement('span');
+      var controls = this.document.createElement('span');
-        var fasterButton = document.createElement('button');
+      var fasterButton = this.document.createElement('button');
-        var slowerButton = document.createElement('button');
+      var slowerButton = this.document.createElement('button');
-        var rewindButton = document.createElement('button');
+      var rewindButton = this.document.createElement('button');
-        var advanceButton = document.createElement('button');
+      var advanceButton = this.document.createElement('button');
-        var hideButton = document.createElement('button');
+      var hideButton = this.document.createElement('button');
 
       rewindButton.innerHTML = '«';
       fasterButton.textContent = '+';
@@ -109,13 +107,13 @@ chrome.extension.sendMessage({}, function(response) {
 
       container.addEventListener('click', function(e) {
         if (e.target === slowerButton) {
-            runAction('slower')
+          runAction('slower', this.document)
         } else if (e.target === fasterButton) {
-            runAction('faster')
+          runAction('faster', this.document)
         } else if (e.target === rewindButton) {
-            runAction('rewind')
+          runAction('rewind', this.document)
         } else if (e.target === advanceButton) {
-            runAction('advance')
+          runAction('advance', this.document)
         } else if (e.target === hideButton) {
           container.nextSibling.classList.add('vc-cancelled')
           container.remove();
@@ -141,8 +139,56 @@ chrome.extension.sendMessage({}, function(response) {
     function setSpeed(v, speed) {
       v.playbackRate = speed;
     }
+  }
 
-      function runAction(action) {
+  function initializeVideoSpeed() {
+    if (document.readyState === 'complete') {
+      clearInterval(readyStateCheckInterval);
+
+      defineVideoController();
+
+      document.addEventListener('keypress', function(event) {
+        // if lowercase letter pressed, check for uppercase key code
+        var keyCode = String.fromCharCode(event.keyCode).toUpperCase().charCodeAt();
+
+        // Ignore keypress event if typing in an input box
+        if ((document.activeElement.nodeName === 'INPUT'
+              && document.activeElement.getAttribute('type') === 'text')
+            || document.activeElement.isContentEditable) {
+          return false;
+        }
+
+        if (keyCode == tc.settings.rewindKeyCode) {
+          runAction('rewind', document)
+        } else if (keyCode == tc.settings.advanceKeyCode) {
+          runAction('advance', document)
+        } else if (keyCode == tc.settings.fasterKeyCode) {
+          runAction('faster', document)
+        } else if (keyCode == tc.settings.slowerKeyCode) {
+          runAction('slower', document)
+        } else if (keyCode == tc.settings.resetKeyCode) {
+          runAction('reset', document)
+        }
+
+        return false;
+      }, true);
+
+      document.addEventListener('DOMNodeInserted', function(event) {
+        var node = event.target || null;
+        if (node && node.nodeName === 'VIDEO') {
+          new tc.videoController(node);
+        }
+      });
+
+      var videoTags = document.getElementsByTagName('video');
+      videoTags.forEach = Array.prototype.forEach;
+      videoTags.forEach(function(video) {
+        var control = new tc.videoController(video);
+      });
+    }
+  }
+
+  function runAction(action, document) {
     var videoTags = document.getElementsByTagName('video');
     videoTags.forEach = Array.prototype.forEach;
 
@@ -153,7 +199,7 @@ chrome.extension.sendMessage({}, function(response) {
         } else if (action === 'advance') {
           v.currentTime += tc.settings.advanceTime;
         } else if (action === 'faster') {
-              // Maxium playback speed in Chrome is set to 16:
+          // Maximum playback speed in Chrome is set to 16:
           // https://code.google.com/p/chromium/codesearch#chromium/src/media/blink/webmediaplayer_impl.cc&l=64
           var s = Math.min(v.playbackRate + tc.settings.speedStep, 16);
           setSpeed(v, Number(s.toFixed(2)));
@@ -189,45 +235,4 @@ chrome.extension.sendMessage({}, function(response) {
       }
     });
   }
-
-      document.addEventListener('keypress', function(event) {
-        // if lowercase letter pressed, check for uppercase key code
-        var keyCode = String.fromCharCode(event.keyCode).toUpperCase().charCodeAt();
-
-        // Ignore keypress event if typing in an input box
-        if ((document.activeElement.nodeName === 'INPUT'
-              && document.activeElement.getAttribute('type') === 'text')
-            || document.activeElement.isContentEditable) {
-          return false;
-        }
-
-        if (keyCode == tc.settings.rewindKeyCode) {
-          runAction('rewind')
-        } else if (keyCode == tc.settings.advanceKeyCode) {
-          runAction('advance')
-        } else if (keyCode == tc.settings.fasterKeyCode) {
-          runAction('faster')
-        } else if (keyCode == tc.settings.slowerKeyCode) {
-          runAction('slower')
-        } else if (keyCode == tc.settings.resetKeyCode) {
-          runAction('reset')
-        }
-
-        return false;
-      }, true);
-
-      document.addEventListener('DOMNodeInserted', function(event) {
-        var node = event.target || null;
-        if (node && node.nodeName === 'VIDEO') {
-          new tc.videoController(node);
-        }
-      });
-
-      var videoTags = document.getElementsByTagName('video');
-      videoTags.forEach = Array.prototype.forEach;
-      videoTags.forEach(function(video) {
-        var control = new tc.videoController(video);
-      });
-    }
-  }
 });