diff --git a/devbuild.number b/devbuild.number index f9add1f8..1e6e06f7 100644 --- a/devbuild.number +++ b/devbuild.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Fri Jul 18 01:45:21 CEST 2014 -build.number=354 +#Sat Jul 19 01:31:33 CEST 2014 +build.number=355 diff --git a/dist/YouTubeCenter-webstore.zip b/dist/YouTubeCenter-webstore.zip index 36991f14..580df4a7 100644 Binary files a/dist/YouTubeCenter-webstore.zip and b/dist/YouTubeCenter-webstore.zip differ diff --git a/dist/YouTubeCenter.crx b/dist/YouTubeCenter.crx index 8639cde4..3c986c53 100644 Binary files a/dist/YouTubeCenter.crx and b/dist/YouTubeCenter.crx differ diff --git a/dist/YouTubeCenter.meta.js b/dist/YouTubeCenter.meta.js index baa07ad8..14e4723c 100644 --- a/dist/YouTubeCenter.meta.js +++ b/dist/YouTubeCenter.meta.js @@ -1,7 +1,7 @@ // ==UserScript== // @name YouTube Center Developer Build // @namespace http://www.facebook.com/YouTubeCenter -// @version 354 +// @version 355 // @author Jeppe Rune Mortensen (YePpHa) // @description YouTube Center contains all kind of different useful functions which makes your visit on YouTube much more entertaining. // @icon https://raw.github.com/YePpHa/YouTubeCenter/master/assets/logo-48x48.png diff --git a/dist/YouTubeCenter.mxaddon b/dist/YouTubeCenter.mxaddon index 56ea3388..7e794ea0 100644 Binary files a/dist/YouTubeCenter.mxaddon and b/dist/YouTubeCenter.mxaddon differ diff --git a/dist/YouTubeCenter.oex b/dist/YouTubeCenter.oex index a370d74b..0fb7c993 100644 Binary files a/dist/YouTubeCenter.oex and b/dist/YouTubeCenter.oex differ diff --git a/dist/YouTubeCenter.safariextension/Info.plist b/dist/YouTubeCenter.safariextension/Info.plist index 2e3e0990..34cd8efd 100644 --- a/dist/YouTubeCenter.safariextension/Info.plist +++ b/dist/YouTubeCenter.safariextension/Info.plist @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleShortVersionString - 354 + 355 CFBundleVersion 116 Chrome diff --git a/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js b/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js index 7ca12fae..23d58c2c 100644 --- a/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js +++ b/dist/YouTubeCenter.safariextension/YouTubeCenter.user.js @@ -24,7 +24,7 @@ // @id YouTubeCenter // @name YouTube Center Developer Build // @namespace http://www.facebook.com/YouTubeCenter -// @version 354 +// @version 355 // @author Jeppe Rune Mortensen // @description YouTube Center contains all kind of different useful functions which makes your visit on YouTube much more entertaining. // @icon https://raw.github.com/YePpHa/YouTubeCenter/master/assets/logo-48x48.png @@ -90,7 +90,7 @@ if (typeof func === "string") { func = "function(){" + func + "}"; } - script.appendChild(document.createTextNode("(" + func + ")(true, 4, true, 354);\n//# sourceURL=YouTubeCenter.js")); + script.appendChild(document.createTextNode("(" + func + ")(true, 4, true, 355);\n//# sourceURL=YouTubeCenter.js")); p.appendChild(script); p.removeChild(script); } @@ -20744,14 +20744,20 @@ var minSmallPlayer = 640; + var maxWatchNonStageWidth0 = 1254; var maxWatchNonStageWidth1 = 1254; var maxWatchNonStageWidth2 = 1360; var maxWatchNonStageWidth3 = 1680; + var maxWatchStageWidth0 = 1680; + + var maxWatchNonStagePlayerWidth0 = 854; var maxWatchNonStagePlayerWidth1 = 854; var maxWatchNonStagePlayerWidth2 = 960; var maxWatchNonStagePlayerWidth3 = 1280; + var maxWatchStagePlayerWidth0 = 1280; + ytcenter.player._updateResize = function(){ if (!ytcenter.settings.enableResize) return; ytcenter.player._resize(_width, _height, _large, _align); @@ -20811,8 +20817,12 @@ var isWatchNonStage301 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch") && 1720 <= innerWidth && 920 <= innerHeight; var isWatchNonStage302 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch-720-mini") && 1720 <= innerWidth && 920 <= innerHeight; + var isWatchStage = ytcenter.utils.hasClass(page, "watch-stage-mode"); var isWatchNonStage = ytcenter.utils.hasClass(page, "watch-non-stage-mode"); + var isWatchStage0 = 1320 <= innerWidth && 870 <= innerHeight && isWatchStage && large; + + var isWatchNonStage0 = 1294 <= innerWidth && 630 <= innerHeight && isWatchNonStage && !large; var isWatchNonStage1 = (isWatchNonStage101 || isWatchNonStage102) && isWatchNonStage && !large; var isWatchNonStage2 = (isWatchNonStage201 || isWatchNonStage202) && isWatchNonStage && !large; var isWatchNonStage3 = (isWatchNonStage301 || isWatchNonStage302) && isWatchNonStage && !large; @@ -20866,13 +20876,18 @@ } // Settings the sizes for small and large. If width and height is undefined - if (isNaN(parseInt(width)) && isNaN(parseInt(height))) { - if (isWatchNonStage3) { + var stageSize = isNaN(parseInt(width)) && isNaN(parseInt(height)); + if (stageSize) { + if (isWatchStage0) { + width = maxWatchStagePlayerWidth0 + "px"; + } else if (isWatchNonStage3) { width = maxWatchNonStagePlayerWidth3 + "px"; } else if (isWatchNonStage2) { width = maxWatchNonStagePlayerWidth2 + "px"; } else if (isWatchNonStage1) { width = maxWatchNonStagePlayerWidth1 + "px"; + } else if (isWatchNonStage0) { + width = maxWatchNonStagePlayerWidth0 + "px"; } else { width = large ? "854px" : "640px"; } @@ -20978,15 +20993,19 @@ playerHeight = Math.round(calcHeight + pbh), playlist_el = document.getElementById("playlist-legacy") || document.getElementById("playlist"); - if (isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1) { + if (stageSize && (isWatchStage0 || isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1 || isWatchNonStage0)) { var maxWidth = minSmallPlayer; var minWidth = minSmallPlayer; - if (isWatchNonStage3) { + if (isWatchStage0) { + maxWidth = maxWatchStagePlayerWidth0; + } else if (isWatchNonStage3) { maxWidth = maxWatchNonStagePlayerWidth3; } else if (isWatchNonStage2) { maxWidth = maxWatchNonStagePlayerWidth2; } else if (isWatchNonStage1) { maxWidth = maxWatchNonStagePlayerWidth1; + } else if (isWatchNonStage0) { + maxWidth = maxWatchNonStagePlayerWidth0; } if (clientWidth > maxWidth) { @@ -21046,7 +21065,11 @@ playerAPI.style.cssFloat = ""; } - if (!large) { + if (large && isWatchStage0 && stageSize) { + player.style.width = "auto"; + player.style.minWidth = minInsidePlayerWidth + "px"; + player.style.maxWidth = maxWatchStageWidth0 + "px"; + } else if (!large && stageSize) { player.style.width = "auto"; player.style.minWidth = minInsidePlayerWidth + "px"; if (isWatchNonStage3) { @@ -21055,6 +21078,8 @@ player.style.maxWidth = maxWatchNonStageWidth2 + "px"; } else if (isWatchNonStage1) { player.style.maxWidth = maxWatchNonStageWidth1 + "px"; + } else if (isWatchNonStage0) { + player.style.maxWidth = maxWatchNonStageWidth0 + "px"; } else { player.style.maxWidth = maxInsidePlayerWidth + "px"; } diff --git a/dist/YouTubeCenter.user.js b/dist/YouTubeCenter.user.js index 531f6d53..9a3270ca 100644 --- a/dist/YouTubeCenter.user.js +++ b/dist/YouTubeCenter.user.js @@ -24,7 +24,7 @@ // @id YouTubeCenter // @name YouTube Center Developer Build // @namespace http://www.facebook.com/YouTubeCenter -// @version 354 +// @version 355 // @author Jeppe Rune Mortensen // @description YouTube Center contains all kind of different useful functions which makes your visit on YouTube much more entertaining. // @icon https://raw.github.com/YePpHa/YouTubeCenter/master/assets/logo-48x48.png @@ -90,7 +90,7 @@ if (typeof func === "string") { func = "function(){" + func + "}"; } - script.appendChild(document.createTextNode("(" + func + ")(true, 0, true, 354);\n//# sourceURL=YouTubeCenter.js")); + script.appendChild(document.createTextNode("(" + func + ")(true, 0, true, 355);\n//# sourceURL=YouTubeCenter.js")); p.appendChild(script); p.removeChild(script); } @@ -20744,14 +20744,20 @@ var minSmallPlayer = 640; + var maxWatchNonStageWidth0 = 1254; var maxWatchNonStageWidth1 = 1254; var maxWatchNonStageWidth2 = 1360; var maxWatchNonStageWidth3 = 1680; + var maxWatchStageWidth0 = 1680; + + var maxWatchNonStagePlayerWidth0 = 854; var maxWatchNonStagePlayerWidth1 = 854; var maxWatchNonStagePlayerWidth2 = 960; var maxWatchNonStagePlayerWidth3 = 1280; + var maxWatchStagePlayerWidth0 = 1280; + ytcenter.player._updateResize = function(){ if (!ytcenter.settings.enableResize) return; ytcenter.player._resize(_width, _height, _large, _align); @@ -20811,8 +20817,12 @@ var isWatchNonStage301 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch") && 1720 <= innerWidth && 920 <= innerHeight; var isWatchNonStage302 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch-720-mini") && 1720 <= innerWidth && 920 <= innerHeight; + var isWatchStage = ytcenter.utils.hasClass(page, "watch-stage-mode"); var isWatchNonStage = ytcenter.utils.hasClass(page, "watch-non-stage-mode"); + var isWatchStage0 = 1320 <= innerWidth && 870 <= innerHeight && isWatchStage && large; + + var isWatchNonStage0 = 1294 <= innerWidth && 630 <= innerHeight && isWatchNonStage && !large; var isWatchNonStage1 = (isWatchNonStage101 || isWatchNonStage102) && isWatchNonStage && !large; var isWatchNonStage2 = (isWatchNonStage201 || isWatchNonStage202) && isWatchNonStage && !large; var isWatchNonStage3 = (isWatchNonStage301 || isWatchNonStage302) && isWatchNonStage && !large; @@ -20866,13 +20876,18 @@ } // Settings the sizes for small and large. If width and height is undefined - if (isNaN(parseInt(width)) && isNaN(parseInt(height))) { - if (isWatchNonStage3) { + var stageSize = isNaN(parseInt(width)) && isNaN(parseInt(height)); + if (stageSize) { + if (isWatchStage0) { + width = maxWatchStagePlayerWidth0 + "px"; + } else if (isWatchNonStage3) { width = maxWatchNonStagePlayerWidth3 + "px"; } else if (isWatchNonStage2) { width = maxWatchNonStagePlayerWidth2 + "px"; } else if (isWatchNonStage1) { width = maxWatchNonStagePlayerWidth1 + "px"; + } else if (isWatchNonStage0) { + width = maxWatchNonStagePlayerWidth0 + "px"; } else { width = large ? "854px" : "640px"; } @@ -20978,15 +20993,19 @@ playerHeight = Math.round(calcHeight + pbh), playlist_el = document.getElementById("playlist-legacy") || document.getElementById("playlist"); - if (isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1) { + if (stageSize && (isWatchStage0 || isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1 || isWatchNonStage0)) { var maxWidth = minSmallPlayer; var minWidth = minSmallPlayer; - if (isWatchNonStage3) { + if (isWatchStage0) { + maxWidth = maxWatchStagePlayerWidth0; + } else if (isWatchNonStage3) { maxWidth = maxWatchNonStagePlayerWidth3; } else if (isWatchNonStage2) { maxWidth = maxWatchNonStagePlayerWidth2; } else if (isWatchNonStage1) { maxWidth = maxWatchNonStagePlayerWidth1; + } else if (isWatchNonStage0) { + maxWidth = maxWatchNonStagePlayerWidth0; } if (clientWidth > maxWidth) { @@ -21046,7 +21065,11 @@ playerAPI.style.cssFloat = ""; } - if (!large) { + if (large && isWatchStage0 && stageSize) { + player.style.width = "auto"; + player.style.minWidth = minInsidePlayerWidth + "px"; + player.style.maxWidth = maxWatchStageWidth0 + "px"; + } else if (!large && stageSize) { player.style.width = "auto"; player.style.minWidth = minInsidePlayerWidth + "px"; if (isWatchNonStage3) { @@ -21055,6 +21078,8 @@ player.style.maxWidth = maxWatchNonStageWidth2 + "px"; } else if (isWatchNonStage1) { player.style.maxWidth = maxWatchNonStageWidth1 + "px"; + } else if (isWatchNonStage0) { + player.style.maxWidth = maxWatchNonStageWidth0 + "px"; } else { player.style.maxWidth = maxInsidePlayerWidth + "px"; } diff --git a/dist/YouTubeCenter.xpi b/dist/YouTubeCenter.xpi index 9c78d9e1..ae8e9fb1 100644 Binary files a/dist/YouTubeCenter.xpi and b/dist/YouTubeCenter.xpi differ diff --git a/dist/chrome-update.xml b/dist/chrome-update.xml index 401d148e..ac676927 100644 --- a/dist/chrome-update.xml +++ b/dist/chrome-update.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/dist/firefox-update.rdf b/dist/firefox-update.rdf index f05a7b0d..4e175f15 100644 --- a/dist/firefox-update.rdf +++ b/dist/firefox-update.rdf @@ -5,7 +5,7 @@ - 354 + 355 {ec8030f7-c20a-464f-9b0e-13a3a9e97384} diff --git a/src/YouTubeCenter.user.js b/src/YouTubeCenter.user.js index 257e82b9..8b4b883c 100644 --- a/src/YouTubeCenter.user.js +++ b/src/YouTubeCenter.user.js @@ -20744,14 +20744,20 @@ var minSmallPlayer = 640; + var maxWatchNonStageWidth0 = 1254; var maxWatchNonStageWidth1 = 1254; var maxWatchNonStageWidth2 = 1360; var maxWatchNonStageWidth3 = 1680; + var maxWatchStageWidth0 = 1680; + + var maxWatchNonStagePlayerWidth0 = 854; var maxWatchNonStagePlayerWidth1 = 854; var maxWatchNonStagePlayerWidth2 = 960; var maxWatchNonStagePlayerWidth3 = 1280; + var maxWatchStagePlayerWidth0 = 1280; + ytcenter.player._updateResize = function(){ if (!ytcenter.settings.enableResize) return; ytcenter.player._resize(_width, _height, _large, _align); @@ -20811,8 +20817,12 @@ var isWatchNonStage301 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch") && 1720 <= innerWidth && 920 <= innerHeight; var isWatchNonStage302 = ytcenter.utils.hasClass(document.body, "appbar-flexwatch-720-mini") && 1720 <= innerWidth && 920 <= innerHeight; + var isWatchStage = ytcenter.utils.hasClass(page, "watch-stage-mode"); var isWatchNonStage = ytcenter.utils.hasClass(page, "watch-non-stage-mode"); + var isWatchStage0 = 1320 <= innerWidth && 870 <= innerHeight && isWatchStage && large; + + var isWatchNonStage0 = 1294 <= innerWidth && 630 <= innerHeight && isWatchNonStage && !large; var isWatchNonStage1 = (isWatchNonStage101 || isWatchNonStage102) && isWatchNonStage && !large; var isWatchNonStage2 = (isWatchNonStage201 || isWatchNonStage202) && isWatchNonStage && !large; var isWatchNonStage3 = (isWatchNonStage301 || isWatchNonStage302) && isWatchNonStage && !large; @@ -20866,13 +20876,18 @@ } // Settings the sizes for small and large. If width and height is undefined - if (isNaN(parseInt(width)) && isNaN(parseInt(height))) { - if (isWatchNonStage3) { + var stageSize = isNaN(parseInt(width)) && isNaN(parseInt(height)); + if (stageSize) { + if (isWatchStage0) { + width = maxWatchStagePlayerWidth0 + "px"; + } else if (isWatchNonStage3) { width = maxWatchNonStagePlayerWidth3 + "px"; } else if (isWatchNonStage2) { width = maxWatchNonStagePlayerWidth2 + "px"; } else if (isWatchNonStage1) { width = maxWatchNonStagePlayerWidth1 + "px"; + } else if (isWatchNonStage0) { + width = maxWatchNonStagePlayerWidth0 + "px"; } else { width = large ? "854px" : "640px"; } @@ -20978,15 +20993,19 @@ playerHeight = Math.round(calcHeight + pbh), playlist_el = document.getElementById("playlist-legacy") || document.getElementById("playlist"); - if (isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1) { + if (stageSize && (isWatchStage0 || isWatchNonStage3 || isWatchNonStage2 || isWatchNonStage1 || isWatchNonStage0)) { var maxWidth = minSmallPlayer; var minWidth = minSmallPlayer; - if (isWatchNonStage3) { + if (isWatchStage0) { + maxWidth = maxWatchStagePlayerWidth0; + } else if (isWatchNonStage3) { maxWidth = maxWatchNonStagePlayerWidth3; } else if (isWatchNonStage2) { maxWidth = maxWatchNonStagePlayerWidth2; } else if (isWatchNonStage1) { maxWidth = maxWatchNonStagePlayerWidth1; + } else if (isWatchNonStage0) { + maxWidth = maxWatchNonStagePlayerWidth0; } if (clientWidth > maxWidth) { @@ -21046,7 +21065,11 @@ playerAPI.style.cssFloat = ""; } - if (!large) { + if (large && isWatchStage0 && stageSize) { + player.style.width = "auto"; + player.style.minWidth = minInsidePlayerWidth + "px"; + player.style.maxWidth = maxWatchStageWidth0 + "px"; + } else if (!large && stageSize) { player.style.width = "auto"; player.style.minWidth = minInsidePlayerWidth + "px"; if (isWatchNonStage3) { @@ -21055,6 +21078,8 @@ player.style.maxWidth = maxWatchNonStageWidth2 + "px"; } else if (isWatchNonStage1) { player.style.maxWidth = maxWatchNonStageWidth1 + "px"; + } else if (isWatchNonStage0) { + player.style.maxWidth = maxWatchNonStageWidth0 + "px"; } else { player.style.maxWidth = maxInsidePlayerWidth + "px"; }