Refactor "finaluri" confusion

semenko · semenko · commit 8be167a36c19 · 2015-04-02T21:28:34.000-05:00
Signed-off-by: Nick Semenkovich &lt;semenko@alum.mit.edu&gt;
diff --git a/chromium/background.js b/chromium/background.js
@@ -207,18 +207,13 @@ function onBeforeRequest(details) {
     }
   }
 
-  // TODO: Clean this silliness
-  var finaluri = null;
-  if (newuristr) {
-      finaluri = document.createElement('a');
-      finaluri.href = newuristr;
-  }
-
   if (newuristr && using_credentials_in_url) {
     // re-insert userpass info which was stripped temporarily
-    finaluri.username = tmp_user;
-    finaluri.password = tmp_pass;
-    newuristr = finaluri.href;
+    var uri_with_credentials = document.createElement('a');
+    uri_with_credentials.href = newuristr;
+    uri_with_credentials.username = tmp_user;
+    uri_with_credentials.password = tmp_pass;
+    newuristr = uri_with_credentials.href;
   }
 
   // In Switch Planner Mode, record any non-rewriteable
@@ -232,7 +227,7 @@ function onBeforeRequest(details) {
   }
 
   if (httpNowhereOn) {
-    if (finaluri && finaluri.protocol === "http:") {
+    if (newuristr && newuristr.substring(0, 5) === "http:") {
       // Abort early if we're about to redirect to HTTP in HTTP Nowhere mode
       return {cancel: true};
     }

Original file line number	Diff line number	Diff line change
`@@ -207,18 +207,13 @@ function onBeforeRequest(details) {`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`
`210`		`- // TODO: Clean this silliness`
`211`		`- var finaluri = null;`
`212`		`- if (newuristr) {`
`213`		`- finaluri = document.createElement('a');`
`214`		`- finaluri.href = newuristr;`
`215`		`- }`
`216`		`-`
`217`	`210`	`if (newuristr && using_credentials_in_url) {`
`218`	`211`	`// re-insert userpass info which was stripped temporarily`
`219`		`- finaluri.username = tmp_user;`
`220`		`- finaluri.password = tmp_pass;`
`221`		`- newuristr = finaluri.href;`
	`212`	`+ var uri_with_credentials = document.createElement('a');`
	`213`	`+ uri_with_credentials.href = newuristr;`
	`214`	`+ uri_with_credentials.username = tmp_user;`
	`215`	`+ uri_with_credentials.password = tmp_pass;`
	`216`	`+ newuristr = uri_with_credentials.href;`
`222`	`217`	`}`
`223`	`218`
`224`	`219`	`// In Switch Planner Mode, record any non-rewriteable`
`@@ -232,7 +227,7 @@ function onBeforeRequest(details) {`
`232`	`227`	`}`
`233`	`228`
`234`	`229`	`if (httpNowhereOn) {`
`235`		`- if (finaluri && finaluri.protocol === "http:") {`
	`230`	`+ if (newuristr && newuristr.substring(0, 5) === "http:") {`
`236`	`231`	`// Abort early if we're about to redirect to HTTP in HTTP Nowhere mode`
`237`	`232`	`return {cancel: true};`
`238`	`233`	`}`