* Fixed align & url issues with new split diffs (fixes jerone#25);

Author: jerone

Github_Commit_Whitespace/Github_Commit_Whitespace.user.js

@@ -10,7 +10,7 @@
 // @downloadURL https://github.com/jerone/UserScripts/raw/master/Github_Commit_Whitespace/Github_Commit_Whitespace.user.js
 // @updateURL   https://github.com/jerone/UserScripts/raw/master/Github_Commit_Whitespace/Github_Commit_Whitespace.user.js
 // @include     https://github.com/*
-// @version     1.3
+// @version     1.4
 // @grant       none
 // ==/UserScript==
 /* global unsafeWindow */
@@ -27,23 +27,38 @@
 
 		var on = /w=/.test(location.search);
 
-		var b = e.querySelector(".minibutton");
+		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("GithubCommitWhitespaceButton", "minibutton", "right", "tooltipped", "tooltipped-s");
+		a.classList.add("minibutton", "tooltipped", "tooltipped-s");
 		if (on) { a.classList.add("selected"); }
-		a.setAttribute("href", on ? location.href.replace(location.search, "") : location.href + "?w=1");
+		a.setAttribute("href", url(on));
 		a.setAttribute("title", on ? "Show commit whitespace" : "Hide commit whitespaces");
 		a.setAttribute("rel", "nofollow");
 		a.setAttribute("aria-label", a.getAttribute("title"));
-		a.style.marginLeft = "10px";  // give us some room;
 		a.appendChild(s);
 
-		b.parentNode.insertBefore(a, b);
+		var g = document.createElement("div");
+		g.classList.add("GithubCommitWhitespaceButton", "button-group", "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;

Github_Commit_Whitespace/README.md

@@ -22,6 +22,8 @@ Adds button to hide whitespaces from commit.
 
 ### Version History
 
+* **1.4**
+    * Fixed align & url issues with new split diffs (fixes https://github.com/jerone/UserScripts/issues/25);
 * **1.3**
     * Fixed issues after recent layout updates (fixes https://github.com/jerone/UserScripts/issues/9);
 * **1.2.1**