fix whitespace

1 files changed, 63 insertions, 55 deletions

diff --git a/chrome/js/redirector.js b/chrome/js/redirector.js
index 86e07a2..da4904a 100644
--- a/chrome/js/redirector.js
+++ b/chrome/js/redirector.js
@@ -1,15 +1,16 @@
 Components.utils.import("chrome://redirector/content/js/xpcom.js");
 Components.utils.import("chrome://redirector/content/js/redirect.js");
 Components.utils.import("chrome://redirector/content/js/redirectorprefs.js");
+Components.utils.import("resource://gre/modules/Services.jsm");
 
 var EXPORTED_SYMBOLS = ['Redirector'];
 
 Redirector = {
-	
+
 	get enabled() {
-		return this._prefs && this._prefs.enabled;	
+		return this._prefs && this._prefs.enabled;
 	},
-	
+
 	set enabled(value) {
 		if (this._prefs) {
 			this._prefs.enabled = value;
@@ -19,11 +20,11 @@ Redirector = {
 	get redirectCount() {
 		return this._list.length;
 	},
-	
+
 	toString : function() {
 		return "Redirector";
 	},
-	
+
 	addRedirect : function(redirect) {
 		this._list.push(redirect);
 		this.save();
@@ -31,17 +32,17 @@ Redirector = {
 
 	debug : function(msg) {
 		if (this._prefs.debugEnabled) {
-			ConsoleService.logStringMessage('REDIRECTOR: ' + msg);
+			Services.console.logStringMessage('REDIRECTOR: ' + msg);
 		}
 	},
-	
+
 	deleteRedirect : function(redirect) {
 		this._list.splice(this._list.indexOf(redirect), 1);
 		this.save();
 	},
-	
+
 	exportRedirects : function(file) {
-		const PR_WRONLY 	 = 0x02;
+		const PR_WRONLY		 = 0x02;
 		const PR_CREATE_FILE = 0x08;
 		const PR_TRUNCATE	 = 0x20;
 
@@ -54,16 +55,16 @@ Redirector = {
 		stream.writeString(JSON.stringify(rjson, null, 4));
 		stream.close();
 	},
-	
+
 	getRedirectAt : function(index) {
-		return this._list[index];	
+		return this._list[index];
 	},
-	
+
 	//Get the redirect url for the given url. This will not check if we are enabled, and
 	//not do any verification on the url, just assume that it is a good string url that is for http/s
 	getRedirectUrl : function(url) {
 		this.debug("Checking " + url);
-		
+
 		for each (var redirect in this._list) {
 			var result = redirect.getMatch(url);
 			if (result.isExcludeMatch) {
@@ -72,7 +73,7 @@ Redirector = {
 				this.debug(url + ' matched pattern ' + redirect.includePattern + ' but the redirect is disabled');
 			} else if (result.isMatch) {
 				redirectUrl = this._makeAbsoluteUrl(url, result.redirectTo);
-				
+
 				//check for loops...
 				result = redirect.getMatch(redirectUrl);
 				if (result.isMatch) {
@@ -89,20 +90,20 @@ Redirector = {
 		}
 		return null;
 	},
-	
+
 	QueryInterface: function(iid) {
 		if (iid.equals(Ci.nsISupports) || iid.equals(Ci.nsIContentPolicy) || iid.equals(Ci.nsIChannelEventSink)) {
 			return this;
 		}
 		throw Cr.NS_ERROR_NO_INTERFACE;
 	},
-	
+
 	_getRedirectsFile : function() {
 		var file = DirectoryService.get("ProfD", Ci.nsIFile);
 		file.append('redirector.rjson');
 		return file;
-	},	
-	
+	},
+
 	handleUpgrades : function(){
 		var currentVersion = '2.7.1';
 		this._list = [];
@@ -111,7 +112,7 @@ Redirector = {
 			return;
 		}
 		//Here update checks are handled
-			
+
 		try {
 			var branch = PrefService.getBranch("extensions.redirector.");
 			var data = branch.getCharPref("redirects");
@@ -126,7 +127,7 @@ Redirector = {
 				if (!redirectString || !redirectString.split) {
 					continue;
 					this.debug('Invalid old redirect: ' + redirectString);
-				}	
+				}
 				var parts = redirectString.split(',,,');
 				if (parts.length < 5) {
 					throw Error("Invalid serialized redirect, too few fields: " + redirectString);
@@ -140,8 +141,8 @@ Redirector = {
 		}
 		branch.deleteBranch('redirects');
 		this._prefs.version = currentVersion;
-	},	
-	
+	},
+
 	importRedirects : function(file) {
 		var fileStream = new FileInputStream(file, 0x01, 0444, 0);
 		var stream = new ConverterInputStream(fileStream, "UTF-8", 16384, Ci.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER);
@@ -171,64 +172,71 @@ Redirector = {
 		var file = this._getRedirectsFile();
 		this.exportRedirects(file);
 	},
-	
+
 	sortRedirects : function(sortFunc) {
 		this._list.sort(sortFunc);
 		this.save();
 	},
-	
+
 	// nsIContentPolicy implementation
 	shouldLoad: function(contentType, contentLocation, requestOrigin, aContext, mimeTypeGuess, extra) {
+		this.debug('REDIRECTOR: inside shouldLoad');
 		if (contentLocation.scheme != "http" && contentLocation.scheme != "https") {
 			return Ci.nsIContentPolicy.ACCEPT;
 		} //Immediately, otherwise we will log all sorts of crap
-			
+
 		this.debug('nsIContentPolicy::ShouldLoad ' + contentLocation.spec);
 		try {
 			//This is also done in getRedirectUrl, but we want to exit as quickly as possible for performance
 			if (!this._prefs.enabled) {
+				this.debug('REDIRECTOR: not enabled');
 				return Ci.nsIContentPolicy.ACCEPT;
 			}
-			
+
 			if (contentType != Ci.nsIContentPolicy.TYPE_DOCUMENT) {
+				this.debug('REDIRECTOR: TYPE DOCUMENT');
 				return Ci.nsIContentPolicy.ACCEPT;
 			}
 
 			if (contentLocation.scheme != "http" && contentLocation.scheme != "https") {
+				this.debug('REDIRECTOR: not http or https');
 				return Ci.nsIContentPolicy.ACCEPT;
 			}
-			
+
 			if (!aContext || !aContext.loadURI) {
+				this.debug('REDIRECTOR: no context or context.loadURI');
 				return Ci.nsIContentPolicy.ACCEPT;
 			}
-			
+
 			var redirectUrl = this.getRedirectUrl(contentLocation.spec);
 
 			if (!redirectUrl) {
+				this.debug('REDIRECTOR: invalid redirect url');
 				return Ci.nsIContentPolicy.ACCEPT;
-			}			
+			}
 
+			this.debug('REDIRECTOR: redirecting');
 			aContext.loadURI(redirectUrl, requestOrigin, null);
 			return Ci.nsIContentPolicy.REJECT_REQUEST;
 		} catch(e) {
-			this.debug(e);	 
+			this.debug(e);
 		}
-		
+
 	},
-	
+
 	shouldProcess: function(contentType, contentLocation, requestOrigin, insecNode, mimeType, extra) {
 		return Ci.nsIContentPolicy.ACCEPT;
 	},
 	//end nsIContentPolicy
 
 	//nsIChannelEventSink implementation
-	
+
 	//For FF4.0. Got this from a thread about adblock plus, https://adblockplus.org/forum/viewtopic.php?t=5895
 	asyncOnChannelRedirect: function(oldChannel, newChannel, flags, redirectCallback) {
 		this.onChannelRedirect(oldChannel, newChannel, flags);
 		redirectCallback.onRedirectVerifyCallback(0);
-	},	
-	
+	},
+
 	onChannelRedirect: function(oldChannel, newChannel, flags)
 	{
 		try {
@@ -237,13 +245,13 @@ Redirector = {
 
 			if (!(newChannel.loadFlags & Ci.nsIChannel.LOAD_DOCUMENT_URI)) {
 				//We only redirect documents...
-				return; 
+				return;
 			}
 
 			if (!this._prefs.enabled) {
 				return;
 			}
-			
+
 			if (!newLocation) {
 				return;
 			}
@@ -265,24 +273,24 @@ Redirector = {
 				} catch(e) {}
 			}
 			if (!webNav) {
-				return; 
+				return;
 			}
 			var redirectUrl = this.getRedirectUrl(newLocation);
 
 			if (redirectUrl) {
 				webNav.loadURI(redirectUrl,null,null,null,null);
 				throw Cr.NS_BASE_STREAM_WOULD_BLOCK; //Throw this because the real error we should throw shows up in console...
-			}			
-			
+			}
+
 		} catch (e if (e != Cr.NS_BASE_STREAM_WOULD_BLOCK)) {
 			// We shouldn't throw exceptions here - this will prevent the redirect.
 			this.debug("Redirector: Unexpected error in onChannelRedirect: " + e + "\n");
 		}
 	},
 	//end nsIChannelEventSink
-	
+
 	//Private members and methods
-			
+
 	_prefs : null,
 	_list : null,
 	_strings : null,
@@ -304,37 +312,37 @@ Redirector = {
 			this.importRedirects(redirectsFile);
 		}
 	},
-	
+
 	_loadStrings : function() {
 		var src = 'chrome://redirector/locale/redirector.properties';
-		var appLocale = LocaleService.getApplicationLocale();
-		this._strings = StringBundleService.createBundle(src, appLocale);	 
-	},	  
-	
+		var appLocale = Services.locale.getApplicationLocale();
+		this._strings = StringBundleService.createBundle(src, appLocale);
+	},
+
 	_containsRedirect : function(redirect) {
 		for each (var existing in this._list) {
 			if (existing.equals(redirect)) {
 				return true;
-			}	
+			}
 		}
 		return false;
 	},
-	
+
 	_getString : function(name) {
 		return this._strings.GetStringFromName(name);
 	},
-	
+
 	_getFormattedString : function(name, params) {
 		return this._strings.formatStringFromName(name, params, params.length);
 	},
-	
+
 	_makeAbsoluteUrl : function(currentUrl, relativeUrl) {
-		
+
 		if (relativeUrl.match(/https?:/)) {
 			return relativeUrl;
-		} 
-		
-		var uri = IOService.newURI(currentUrl, null, null); 
+		}
+
+		var uri = IOService.newURI(currentUrl, null, null);
 		return uri.resolve(relativeUrl);
 	}
 };