Update player.js slightly more readable autoplayDisable

[raszpl]

No description provided.

[ImprovedTube]

keeping some references like // quick fix https://github.com/code-charity/youtube/issues/1703 thanks to @AirRaid#9957 (/* document.documentElement.dataset.pageType === "video" */
might be fine at the end of some lines?

i dont know if it is true. if it is true it can prevent somebody from thinking of undoing the change in future.

[raszpl]

I looked into this.

#1703:

also the timing of above function is slightly later through

doesnt appear to be true right now. ImprovedTube.pageType() is reliably called very early in init and later on every page change.

youtube/js&css/web-accessible/init.js

Lines 115 to 116 in 7014a79

	document.addEventListener('yt-navigate-finish', function () {
	ImprovedTube.pageType();

but maybe it wasnt there at the time?

AirRaid
And yeah, confirming - it was pageType === "video" and pageType === "channel"

How was this confirmed ? Logging both into console and catching bad case? or just "I changed this and videos pause reliably now so its probably it"? :) because pausing autoplay has been broken ever since #2042 (comment)

Regardless at the end of the day all are same comparison anyway:

document.documentElement.dataset.pageType === "video"
location.href.includes('/watch?')
location.pathname == '/watch'

I would argue using pageType isnt much more readable nor faster. Maybe it should be left alone for just controlling CSS

youtube/js&css/extension/www.youtube.com/appearance/header/header.css

Line 19 in 7014a79

html[it-header-position=hidden_on_video_page][data-page-type=video] #masthead-container:not([it-search-focus=true]) {

speaking of which
dataset.pageType https://github.com/search?q=repo%3Acode-charity%2Fyoutube+data-page-type&type=code
and it-pathname https://github.com/search?q=repo%3Acode-charity%2Fyoutube+it-pathname&type=code
both are doing same thing, should probably be combined

[ImprovedTube]

thank you @raszpl

dataset.pageType ...
and it-pathname ...
both are doing same thing, should probably be combined

Yay! Let's document if there is any reason not to keep it simpler (for people who didn't develop extensions)

Extension-context vs. Web-accessible shouldn't distract.

pageType() runs on yt-page-data-updated

youtube/js&css/web-accessible/init.js

Lines 84 to 88 in 9266d8d

	ImprovedTube.init = function () {
	window.addEventListener('yt-page-data-updated', function () {
	ImprovedTube.pageType();
	});
	ImprovedTube.pageType();

both run on yt-navigate-finish

youtube/js&css/web-accessible/init.js

Lines 116 to 117 in 9266d8d

	document.addEventListener('yt-navigate-finish', function () {
	ImprovedTube.pageType();

youtube/js&css/extension/init.js

Lines 2 to 9 in 9266d8d

	>>> INITIALIZATION
	--------------------------------------------------------------*/
	extension.features.youtubeHomePage('init');
	document.documentElement.setAttribute('it-pathname', location.pathname);
	window.addEventListener('yt-navigate-finish', function () {
	document.documentElement.setAttribute('it-pathname', location.pathname);

and both should alternatively run on every change of the URL bar

[ImprovedTube]

• aand we should notice the other two video-page types: embed, shorts

  youtube/js&css/web-accessible/functions.js

  Lines 276 to 288 in 9266d8d

  	ImprovedTube.pageType = function () {
  	if (/\/watch\?/.test(location.href)) {
  	document.documentElement.dataset.pageType = 'video';
  	} else if (location.pathname === '/') {
  	document.documentElement.dataset.pageType = 'home';
  	} else if (/\/subscriptions\?/.test(location.href)) {
  	document.documentElement.dataset.pageType = 'subscriptions';
  	} else if (/\/@|(\/(channel|user|c)\/)[^/]+(?!\/videos)/.test(location.href)) {
  	document.documentElement.dataset.pageType = 'channel';
  	} else {
  	document.documentElement.dataset.pageType = 'other';
  	}
  	};

  ( BTW, if i remember correctly, location.href was/is much faster, even it is a longer string to regex. )
  
  
  • and the end of this function (buttons) should also run for embedded videos? (+ #2238 ) ( seems we didnt considered embedded players much yet: https://github.com/search?q=repo%3Acode-charity%2Fyoutube++%28parent.location+OR+embed%2F+OR+%2Fembed%29&type=code )
    

    youtube/js&css/web-accessible/functions.js

    Lines 296 to 326 in 9266d8d

    	ImprovedTube.videoPageUpdate = function () {
    	if (document.documentElement.dataset.pageType === 'video') {
    	var video_id = this.getParam(new URL(location.href).search.substr(1), 'v');
    	if (this.storage.track_watched_videos === true && video_id) {
    	ImprovedTube.messages.send({action: 'watched',
    	type: 'add',
    	id: video_id,
    	title: document.title
    	});
    	}
    	this.initialVideoUpdateDone = true;
    	ImprovedTube.howLongAgoTheVideoWasUploaded();
    	ImprovedTube.dayOfWeek();
    	ImprovedTube.channelVideosCount();
    	ImprovedTube.upNextAutoplay();
    	ImprovedTube.playerAutofullscreen();
    	ImprovedTube.playerSize();
    	if (this.storage.player_always_repeat === true) { ImprovedTube.playerRepeat(); };
    	ImprovedTube.playerScreenshotButton();
    	ImprovedTube.playerRepeatButton();
    	ImprovedTube.playerRotateButton();
    	ImprovedTube.playerPopupButton();
    	ImprovedTube.playerFitToWinButton();
    	ImprovedTube.playerCinemaModeButton();
    	ImprovedTube.playerHamburgerButton();
    	ImprovedTube.playerControls();
    	}
    	};

    • ( This ImprovedTube.videoPageUpdate is called at init and yt-navigate-finish:
      

      youtube/js&css/web-accessible/init.js

      Lines 106 to 109 in 9266d8d

      	if (ImprovedTube.elements.player && ImprovedTube.elements.player.setPlaybackRate) {
      	ImprovedTube.videoPageUpdate();
      	ImprovedTube.initPlayer();
      	}

      )

---

• to make this note random & lengthy: i added the videoID() function

  youtube/js&css/web-accessible/functions.js

  Line 634 in 9266d8d

  ImprovedTube.videoId = function (url = document.URL) {return url.match(ImprovedTube.regex.video_id)[1] || url.searchParams.get('v') || movie_player.getVideoData().video_id};

  and edited the regex to cover shorts & embedded videos

  youtube/js&css/web-accessible/core.js

  Line 37 in 9266d8d

  video_id: /(?:[?&]v=|embed\/|shorts\/)([^&?]{11})/,

  • while the author had to care for efficiency & compatibility (

    youtube/js&css/web-accessible/functions.js

    Line 298 in 9266d8d

    var video_id = this.getParam(new URL(location.href).search.substr(1), 'v');

    search.substr(1), 'v' is efficient, yet brower's regex are optimized. And getParam() was required years ago (https://caniuse.com/?search=searchparams searchParams isn't very old.) (yet we have some users with historic browsers)

  • youtube/js&css/web-accessible/www.youtube.com/blocklist.js

    Line 45 in 9266d8d

    var id = node.href.match(ImprovedTube.regex.video_id);

    youtube/js&css/web-accessible/www.youtube.com/player.js

    Line 1033 in 9266d8d

    if (videoLink && videoLink.href.match(ImprovedTube.regex.video_id)[1] !== videoID) this.location.search = this.location.search.replace(/(\?)list=[^&]+&|&list=[^&]+/, '$1');

    youtube/js&css/web-accessible/www.youtube.com/appearance.js

    Line 465 in 9266d8d

    id = this.getParam(location.href.slice(location.href.indexOf("?") + 1), "v");

[raszpl]

This is cursed!
1 2df3a5e#commitcomment-141736315

2

youtube/js&css/web-accessible/www.youtube.com/player.js

Line 36 in c91976e

} else { video.pauseVideo();

wont work, we are inside a play handler, video hasnt started playing yet so there is nothing to stop.