www

commit 9c91018964c141c1309b58855c4757505de59df8
parent 18bb18ba5161245ce37398a997b7633a69e45cce
Author: Dan Stillman <dstillman@zotero.org>
Date:   Thu, 13 Apr 2017 04:28:13 -0400

Reduce indentation in waitForWindow() support function

Diffstat:
M
test/content/support.js
 | 
53
+++++++++++++++++++++++++++--------------------------

1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/test/content/support.js b/test/content/support.js
@@ -85,35 +85,36 @@ function waitForWindow(uri, callback) {
 	var loadobserver = function(ev) {
 		ev.originalTarget.removeEventListener("load", loadobserver, false);
 		Zotero.debug("Window opened: " + ev.target.location.href);
-		if(ev.target.location.href == uri) {
-			Services.ww.unregisterNotification(winobserver);
-			var win = ev.target.docShell
-				.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
-				.getInterface(Components.interfaces.nsIDOMWindow);
-			// Give window code time to run on load
-			win.setTimeout(function () {
-				if (callback) {
-					try {
-						// If callback is a promise, wait for it
-						let maybePromise = callback(win);
-						if (maybePromise && maybePromise.then) {
-							maybePromise.then(() => deferred.resolve(win)).catch(e => deferred.reject(e));
-							return;
-						}
-					}
-					catch (e) {
-						Zotero.logError(e);
-						win.close();
-						deferred.reject(e);
+		
+		if (ev.target.location.href != uri) {
+			Zotero.debug(`Ignoring window ${uri} in waitForWindow()`);
+			return;
+		}
+		
+		Services.ww.unregisterNotification(winobserver);
+		var win = ev.target.docShell
+			.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
+			.getInterface(Components.interfaces.nsIDOMWindow);
+		// Give window code time to run on load
+		 win.setTimeout(function () {
+			if (callback) {
+				try {
+					// If callback returns a promise, wait for it
+					let maybePromise = callback(win);
+					if (maybePromise && maybePromise.then) {
+						maybePromise.then(() => deferred.resolve(win)).catch(e => deferred.reject(e));
 						return;
 					}
 				}
-				deferred.resolve(win);
-			});
-		}
-		else {
-			Zotero.debug(`Ignoring window ${uri} in waitForWindow()`);
-		}
+				catch (e) {
+					Zotero.logError(e);
+					win.close();
+					deferred.reject(e);
+					return;
+				}
+			}
+			deferred.resolve(win);
+		});
 	};
 	var winobserver = {"observe":function(subject, topic, data) {
 		if(topic != "domwindowopened") return;