1.6.0

- Fixed #363 - Restored 0 delay when presenting video thumbnail when autoplay is off
ParticleCore · Oct 11, 2016 · 05d61d2 · 05d61d2
1 parent 22aba74
commit 05d61d2
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/bin/update.json b/bin/update.json
@@ -2,7 +2,7 @@
     "addons": {
         "[email protected]": {
             "updates": [{
-                "version": "1.5.9",
+                "version": "1.6.0",
                 "update_link": "https://github.com/ParticleCore/Particle/raw/master/dist/YouTubePlus.xpi",
                 "applications": {
                     "gecko": {

diff --git a/dist/YouTubePlus.xpi b/dist/YouTubePlus.xpi
diff --git a/src/Userscript/YouTubePlus.user.js b/src/Userscript/YouTubePlus.user.js
@@ -1,5 +1,5 @@
 // ==UserScript==
-// @version         1.5.9
+// @version         1.6.0
 // @name            YouTube +
 // @namespace       https://github.com/ParticleCore
 // @description     YouTube with more freedom
@@ -1540,9 +1540,22 @@
                 if (!temp) {
                     return;
                 }
-                max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH || 1280);
-                max_width = document.documentElement.clientWidth >= max_width ? max_width : document.documentElement.clientWidth;
+                temp = document.documentElement.clientWidth;
                 is_small = window.innerWidth < 657 ? "" : ".watch-stage-mode ";
+                if (is_small !== "") {
+                    if (user_settings.VID_PLR_FIT_WDTH) {
+                        if (user_settings.VID_PLR_FIT_WDTH.match("%")) {
+                            max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH) / 100 * temp;
+                        } else {
+                            max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH);
+                        }
+                        max_width = temp >= max_width ? max_width : temp;
+                    } else {
+                        max_width = temp >= 1280 ? 1280 : temp;
+                    }
+                } else {
+                    max_width = temp;
+                }
                 content = //
                     `@media screen and (max-width: 656px) {
                         #player-api,
@@ -2199,7 +2212,7 @@
                     holder = document.createElement("link");
                     holder.rel = "stylesheet";
                     holder.type = "text/css";
-                    holder.href = "https://particlecore.github.io/Particle/stylesheets/YouTubePlus.css?v=1.5.9";
+                    holder.href = "https://particlecore.github.io/Particle/stylesheets/YouTubePlus.css?v=1.6.0";
                     document.documentElement.appendChild(holder);
                 }
                 holder = document.createElement("script");

diff --git a/src/Webextension/CSS/YouTubePlus.css b/src/Webextension/CSS/YouTubePlus.css
@@ -591,6 +591,10 @@
     .watch.watch-stage-mode #player-playlist.watch-player-playlist{
        min-width: 0 !important;
     }
+    html:not(.part_autoplayon) .ytp-thumbnail-overlay,
+    html:not(.part_autoplayon) .ytp-large-play-button{
+       transition: none !important;
+    }
     #placeholder-player .player-api {
         background-color: transparent !important;
     }

diff --git a/src/Webextension/JS/YouTubePlus.user.js b/src/Webextension/JS/YouTubePlus.user.js
@@ -1,5 +1,5 @@
 // ==UserScript==
-// @version         1.5.9
+// @version         1.6.0
 // @name            YouTube +
 // @namespace       https://github.com/ParticleCore
 // @description     YouTube with more freedom
@@ -1540,9 +1540,22 @@
                 if (!temp) {
                     return;
                 }
-                max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH || 1280);
-                max_width = document.documentElement.clientWidth >= max_width ? max_width : document.documentElement.clientWidth;
+                temp = document.documentElement.clientWidth;
                 is_small = window.innerWidth < 657 ? "" : ".watch-stage-mode ";
+                if (is_small !== "") {
+                    if (user_settings.VID_PLR_FIT_WDTH) {
+                        if (user_settings.VID_PLR_FIT_WDTH.match("%")) {
+                            max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH) / 100 * temp;
+                        } else {
+                            max_width = window.parseInt(user_settings.VID_PLR_FIT_WDTH);
+                        }
+                        max_width = temp >= max_width ? max_width : temp;
+                    } else {
+                        max_width = temp >= 1280 ? 1280 : temp;
+                    }
+                } else {
+                    max_width = temp;
+                }
                 content = //
                     `@media screen and (max-width: 656px) {
                         #player-api,
@@ -2199,7 +2212,7 @@
                     holder = document.createElement("link");
                     holder.rel = "stylesheet";
                     holder.type = "text/css";
-                    holder.href = "https://particlecore.github.io/Particle/stylesheets/YouTubePlus.css?v=1.5.9";
+                    holder.href = "https://particlecore.github.io/Particle/stylesheets/YouTubePlus.css?v=1.6.0";
                     document.documentElement.appendChild(holder);
                 }
                 holder = document.createElement("script");

diff --git a/src/Webextension/manifest.json b/src/Webextension/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "YouTube Plus",
-    "version": "1.5.9",
+    "version": "1.6.0",
     "description": "YouTube with more freedom",
     "default_locale": "en",
     "icons": {