From 66f490ff1752bdcababd51b9af52bdf79688afec Mon Sep 17 00:00:00 2001
From: Stephen Celis <stephen@stephencelis.com>
Date: Tue, 21 Oct 2008 15:16:49 +0200
Subject: [PATCH] HTMLviews: various cleanups

---
 html/GitX.js            |  1 -
 html/commit.js          |  3 +--
 html/diff.html          | 16 +++++++++-------
 html/diffHighlighter.js | 21 ++++++---------------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/html/GitX.js b/html/GitX.js
index 4663664..419e8b5 100644
--- a/html/GitX.js
+++ b/html/GitX.js
@@ -6,7 +6,6 @@
  */
 
 function $(element) {
-	Controller.log_("Calling _");
 	return document.getElementById(element);
 }
 
diff --git a/html/commit.js b/html/commit.js
index e8d4b10..1dcf2e5 100644
--- a/html/commit.js
+++ b/html/commit.js
@@ -68,8 +68,7 @@ var gistie = function() {
 	// TODO: Replace true with private preference
 	token = Controller.getConfig_("github.token");
 	login = Controller.getConfig_("github.user");
-	if (token && login)
-	{
+	if (token && login) {
 		parameters.login = login;
 		parameters.token = token;
 	} else {
diff --git a/html/diff.html b/html/diff.html
index 26c262a..1c856cf 100644
--- a/html/diff.html
+++ b/html/diff.html
@@ -9,24 +9,26 @@
 	<script>
 		var showFileChanges = function(file, cached) {
 			// New file?
+			var diff = $("diff");
+
 			if (file.status == 0)
 			{
 				var contents = file.unstagedChanges();
 				if (contents)
-					$("diff").innerHTML = contents.escapeHTML();
+					diff.innerHTML = contents.escapeHTML();
 				else
-					$("diff").innerHTML = "Could not display changes";
+					diff.innerHTML = "Could not display changes";
 
-				$("diff").style.display = '';
+				diff.style.display= '';
 				$('title').innerHTML = "New file: " + file.path;
 			}  else {
-				$("diff").style.display = 'none';
+				diff.style.display = 'none';
 				if (cached)
-					$("diff").innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
+					diff.innerHTML = file.cachedChangesAmend_(Controller.amend()).escapeHTML();
 				else
-					$("diff").innerHTML = file.unstagedChanges().escapeHTML();
+					diff.innerHTML = file.unstagedChanges().escapeHTML();
 				highlightDiffs();
-				$("diff").style.display = '';
+				diff.style.display = '';
 				$("title").innerHTML = "Changes for " + file.path;
 			}
 		}
diff --git a/html/diffHighlighter.js b/html/diffHighlighter.js
index c74bea4..983b9a0 100644
--- a/html/diffHighlighter.js
+++ b/html/diffHighlighter.js
@@ -1,9 +1,7 @@
-
 // If we run from a Safari instance, we don't
 // have a Controller object. Instead, we fake it by
 // using the console
-if (typeof Controller == 'undefined')
-{
+if (typeof Controller == 'undefined') {
 	Controller = console;
 	Controller.log_ = console.log;
 }
@@ -42,23 +40,19 @@ var highlightDiffs = function() {
 				continue;
 			}
 
-
 			if (firstChar == "+") {
 				// Highlight trailing whitespace
 				if (m = l.match(/\s+$/))
-				  l = l.replace(/\s+$/, "<span class='whitespace'>" + m + "</span>");
+					l = l.replace(/\s+$/, "<span class='whitespace'>" + m + "</span>");
 
 				line1 += "\n";
 				line2 += ++hunk_start_line_2 + "\n";
 				diffContent += "<div class='addline'>" + l + "</div>";
-			}
-			else if (firstChar == "-") {
+			} else if (firstChar == "-") {
 				line1 += ++hunk_start_line_1 + "\n";
 				line2 += "\n";
 				diffContent += "<div class='delline'>" + l + "</div>";
-			}
-			else if (firstChar == "@")
-			{
+			} else if (firstChar == "@") {
 				header = false;
 				if (m = l.match(/@@ \-([0-9]+),\d+ \+(\d+),\d+ @@/))
 				{
@@ -68,22 +62,19 @@ var highlightDiffs = function() {
 				line1 += "...\n";
 				line2 += "...\n";
 				diffContent += "<div class='hunkheader'>" + l + "</div>";
-			}
-			else if (firstChar == " ")
-			{
+			} else if (firstChar == " ") {
 				line1 += ++hunk_start_line_1 + "\n";
 				line2 += ++hunk_start_line_2 + "\n";
 				diffContent += l + "\n";
 			}
 		}
 
-
 		// This takes about 7ms
 		diff.innerHTML = "<table class='diff'><tr><td class='lineno'l><pre>" + line1 + "</pre></td>" +
 		                  "<td class='lineno'l><pre>" + line2 + "</pre></td>" +
 		                  "<td width='100%'><pre width='100%'>" + diffContent + "</pre></td></tr></table>";
-
 	}
+
 	// TODO: Replace this with a performance pref call
 	if (false)
 		Controller.log_("Total time:" + (new Date().getTime() - start));