🎬 New version of GitHub Commit Whitespace

Author: jerone

Github_Commit_Whitespace/Github_Commit_Whitespace.user.js

@@ -11,69 +11,82 @@
 // @updateURL   https://github.com/jerone/UserScripts/raw/master/Github_Commit_Whitespace/Github_Commit_Whitespace.user.js
 // @supportURL  https://github.com/jerone/UserScripts/issues
 // @contributionURL https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VCYMHWQ7ZMBKW
+// @icon        https://github.com/fluidicon.png
 // @include     https://github.com/*
-// @version     1.4.2
+// @version     1.4.3
 // @grant       none
 // ==/UserScript==
 /* global unsafeWindow */
 
 (function() {
 
-	function addButton() {
-		var e;
-		if (!(/\/commit\//.test(location.href) || /\/compare\//.test(location.href) || /\/pull\/\d*\/files/.test(location.href)) ||
-			!(e = document.getElementById("toc"))) { return; }
-
-		var r = e.querySelector(".GithubCommitWhitespaceButton");
-		if (r) { r.parentElement.removeChild(r); }
-
-		var on = /w=/.test(location.search);  // any occurense results in enabling;
-
-		var b = e.querySelector(".toc-diff-stats");
-
-		var s = document.createElement("span");
-		s.textContent = " \u2423";
-		s.style.color = "#333";  // set color because of css selector `p.explain .octicon`;
-
-		var a = document.createElement("a");
-		a.classList.add("btn", "btn-sm", "tooltipped", "tooltipped-n");
-		if (on) { a.classList.add("selected"); }
-		a.setAttribute("href", url(on));
-		a.setAttribute("rel", "nofollow");
-		a.setAttribute("aria-label", on ? "Show commit whitespace" : "Hide commit whitespaces");
-		a.appendChild(s);
-
-		var g = document.createElement("div");
-		g.classList.add("GithubCommitWhitespaceButton", "right");
-		g.style.margin = "0 10px 0 0";  // give us some room;
-		g.appendChild(a);
-
-		b.parentNode.insertBefore(g, b);
-	}
-
-	function url(on) {
-		var searches = location.search.replace(/^\?/, "").split("&").filter(function(item) {
-			return item && !/w=.*/.test(item);
-		});
-		if (!on) {
-			searches.push("w=1");
-		}
-		return location.href.replace(location.search, "")
-			+ (searches.length > 0 ? "?" + searches.join("&") : "");
-	}
-
-	// init;
-	addButton();
-
-	// on pjax;
-	unsafeWindow.$(document).on("pjax:end", addButton);  // `pjax:end` also runs on history back;
-
-	// on PR files tab;
-	var f;
-	if ((f = document.querySelector(".js-pull-request-tab[data-container-id='files_bucket']"))) {
-		f.addEventListener("click", function() {
-			window.setTimeout(addButton, 13);
-		});
-	}
+    function addButton() {
+        var e;
+        if ((/\/commit\//.test(location.href) || /\/compare\//.test(location.href)) && (e = document.getElementById("toc"))) {
+
+            var r = e.querySelector(".GithubCommitWhitespaceButton");
+            if (r) {
+                r.parentElement.removeChild(r);
+            }
+
+            var on = /w=/.test(location.search); // any occurense results in enabling;
+
+            var b = e.querySelector(".toc-diff-stats");
+
+            var a = document.createElement("a");
+            a.classList.add("btn", "btn-sm", "tooltipped", "tooltipped-n");
+            if (on) {
+                a.classList.add("selected");
+            }
+            a.setAttribute("href", url(on));
+            a.setAttribute("rel", "nofollow");
+            a.setAttribute("aria-label", on ? "Show commit whitespace" : "Hide commit whitespaces");
+            a.appendChild(document.createTextNode(" \u2423"));
+
+            var g = document.createElement("div");
+            g.classList.add("GithubCommitWhitespaceButton", "right");
+            g.style.margin = "0 10px 0 0"; // give us some room;
+            g.appendChild(a);
+
+            b.parentNode.insertBefore(g, b);
+        } else if (/\/pull\/\d*\/files/.test(location.href) && (e = document.querySelector("#files_bucket .pr-toolbar .diffbar > .right"))) {
+
+            var r = e.querySelector(".GithubCommitWhitespaceButton");
+            if (r) {
+                r.parentElement.removeChild(r);
+            }
+
+            var on = /w=/.test(location.search); // any occurense results in enabling;
+
+            var a = document.createElement("a");
+            a.classList.add("btn-link", "muted-link");
+            a.setAttribute("href", url(on));
+            a.setAttribute("rel", "nofollow");
+            a.setAttribute("aria-label", on ? "Show commit whitespace" : "Hide commit whitespaces");
+            a.appendChild(document.createTextNode(on ? "Show whitespace" : "Hide whitespace"));
+
+            var g = document.createElement("div");
+            g.classList.add("GithubCommitWhitespaceButton", "diffbar-item");
+            g.appendChild(a);
+
+            e.insertBefore(g, e.firstChild);
+        }
+    }
+
+    function url(on) {
+        var searches = location.search.replace(/^\?/, "").split("&").filter(function(item) {
+            return item && !/w=.*/.test(item);
+        });
+        if (!on) {
+            searches.push("w=1");
+        }
+        return location.href.replace(location.search, "") + (searches.length > 0 ? "?" + searches.join("&") : "");
+    }
+
+    // init;
+    addButton();
+
+    // on pjax;
+    document.addEventListener('pjax:end', addButton);
 
 })();

Github_Commit_Whitespace/README.md

@@ -28,6 +28,8 @@ This works on commits, pull requests and compare pages.
 
 ## Version History
 
+* **1.4.3**
+    * Fixed issues after recent layout updates;
 * **1.4.2**
     * Fixed issues after recent layout updates;
 * **1.4.1**