README.md

@@ -1,7 +1,6 @@
 # Better Youtube +
 Better YouTube + works to improve the YouTube experience by providing quick access to features we'd all like to have from the get-go.
 <br/>
-  * It defaults playback to 1080p if able to.
   * It allows quick thumbnail access of the video.
   * It allows setting the loop mode easily.
   * It allows setting the loop mode to a ranged set.
@@ -12,8 +11,8 @@ Better YouTube + works to improve the YouTube experience by providing quick acce
   * It shows volume level as you scroll.
   * It lets Unix, Linux, and MacOS systems have the ability to download the video using native app calls.
 
-# Version: 1.5.7
+# Version: 1.5.4
-* Added injection script to default to 1080p playback
+* Fixed loop breakage
 
 # Download
 https://addons.mozilla.org/en-US/firefox/addon/better-youtube-plus/

src/inject.js

@@ -1,149 +0,0 @@
-'use strict';
-
-
-//  ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'auto']
-const prefs = {
-  hd: true,
-  once: false,
-  higher: true,
-  quality: "hd1080",
-  log: false,
-  highFramerate: true
-};
-
-
-const script = document.createElement('script');
-Object.assign(script.dataset, prefs);
-script.textContent = `
-  window.yttools = window.yttools || [];
-
-  {
-      const isTypeSupported = MediaSource.isTypeSupported;
-      MediaSource.isTypeSupported = function(videoType) {
-          const prefs = resolutionChangeListener.prefs;
-          // Block all queries regarding high-framerate support.
-          if (prefs.highFramerate === 'false') {
-              const matches = videoType.match(/framerate=(\\d+)/);
-              if (matches && (matches[1] > 30)) {
-                  return false;
-              }
-          }
-          return isTypeSupported(videoType);
-      }
-  }
-
-  function resolutionChangeListener(e) {
-      const prefs = resolutionChangeListener.prefs;
-      const player = resolutionChangeListener.player;
-      const log = (...args) => prefs.log === 'true' && console.log('Better-Youtube-Plus: ', ...args);
-
-      try {
-          if (e === 1 && player) {
-              const levels = player.getAvailableQualityLevels();
-              if (levels.length === 0) {
-                  return log("Returned empty quality levels...");
-              }
-
-              //  ['hd2160', 'hd1440', 'hd1080', 'hd720', 'large', 'medium', 'small', 'tiny', 'auto']
-              const qualities = player.getAvailableQualityLevels();
-              const q = player.getPlaybackQuality();
-              if ((q.startsWith('h') && prefs.quality.startsWith('h')) && prefs.hd === 'true') {
-                  console.log("Quality matches requested resolution...");
-                  return;
-              }
-
-              const compare = (q1, q2) => {
-                  if (q2 === 'auto') {
-                      return false;
-                  }
-                  const i1 = qualities.indexOf(q1);
-                  const i2 = qualities.indexOf(q2);
-                  if (i1 === -1 || i2 === -1) {
-                      return false;
-                  }
-                  return i1 - i2 <= 0;
-              };
-
-              if (prefs.higher === 'true' && compare(q, prefs.quality)) {
-                  return log('Quality is higher than ' + prefs.quality + '... skipping quality change.');
-              }
-              if (q === prefs.quality) {
-                  return log('Selected quality is okay...');
-              }
-
-              const find = increase => {
-                  if (prefs.quality === 'highest') {
-                      return levels[0];
-                  }
-                  else {
-                      if (increase) {
-                          prefs.quality = qualities[qualities.indexOf(prefs.quality) - 1] || levels[0];
-                      }
-                      const index = levels.indexOf(prefs.quality);
-                      if (index !== -1) {
-                          return prefs.quality;
-                      }
-                      return find(true);
-                  }
-              };
-
-              const nq = find();
-              if (q === nq) {
-                  return log('Requested quality is unavailable... skipping change.');
-              }
-              player.setPlaybackQuality(nq);
-              try {
-                  player.setPlaybackQualityRange(nq, nq);
-              }
-              catch (e) {}
-              if (prefs.once === 'true') {
-                  player.removeEventListener('onStateChange', 'resolutionChangeListener');
-                  window.resolutionChangeListener = () => {};
-                  log("Removing Listener...");
-              }
-
-              log('Quality was ' + q + ' and now is set to ' + nq);
-          }
-      }
-      catch (e) {
-          log(e);
-      }
-  }
-
-  resolutionChangeListener.prefs = document.currentScript.dataset;
-  window.yttools.push(e => {
-      resolutionChangeListener.player = e;
-      resolutionChangeListener(1);
-      e.addEventListener('onStateChange', resolutionChangeListener);
-  });
-
-  function onYouTubePlayerReady(player) {
-      if (yttools.resolved !== true) {
-          yttools.resolved = true;
-          yttools.forEach(c => {
-              try {
-                  c(player);
-              }
-              catch (e) {}
-          });
-      }
-  }
-
-
-  window.addEventListener('spfready', () => {
-      if (typeof window.ytplayer === 'object' && window.ytplayer.config && yttools.resolved !== true) {
-          window.ytplayer.config.args.jsapicallback = 'onYouTubePlayerReady';
-      }
-  });
-
-  window.addEventListener('yt-navigate-finish', () => {
-      const player = document.querySelector('.html5-video-player');
-      if (player && yttools.resolved !== true) {
-          yttools.resolved = true;
-          yttools.forEach(c => c(player));
-      }
-  });
-`;
-
-document.documentElement.appendChild(script);
-script.remove();

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Better Youtube +",
-  "version": "1.5.7",
+  "version": "1.5.4",
   "description": "Enhancements for Youtube to have a better experience.",
 
   "applications": {
@@ -13,16 +13,9 @@
   "permissions": [
     "nativeMessaging",
     "tabs",
-    "*://www.youtube.com/*"
+    "*://*.youtube.com/*"
   ],
 
-  "content_scripts": [{
-      "matches": ["*://www.youtube.com/*"],
-      "js": ["inject.js"],
-      "run_at": "document_start",
-      "all_frames": true
-  }],
-
   "icons": {
     "48": "icons/betterYoutube_48.png",
     "96": "icons/betterYoutube_96.png"

src/scripts/betterYoutube.js

@@ -142,10 +142,10 @@
         slugInputTag     = document.getElementById("slugCopyZone");
 
         // Video Controler
-        video  = document.getElementsByTagName("video")[0];  // Actual video object (I think...)
+        video = document.getElementsByTagName("video")[0];
-
         // Container of actual player (Used for floating window)
         containerOfPlyrWndow = document.getElementById("player-container");
+
         part = "https://img.youtube.com/vi/";
     }
 
@@ -153,6 +153,7 @@
         slugInputTag.value = video.baseURI.slice(32, 32+11);
         ytRangeStart.value = "0:00";
 
+        // We need to wait for info to load before getting full duration
         setTimeout(function () {
             videoTimeLength  = document.getElementsByClassName("ytp-time-duration")[0].innerText;
             ytRangeEnd.value = videoTimeLength;