Flatten structure of getWindowLocation()

sinonjs · Apr 22, 2017 · 4fe0a73 · 4fe0a73
1 parent 77a360a
commit 4fe0a73
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/lib/sinon/util/fake_server.js b/lib/sinon/util/fake_server.js
@@ -26,19 +26,21 @@ function getDefaultWindowLocation() {
 }
 
 function getWindowLocation() {
-    if ( typeof window !== "undefined") {
-        if (typeof window.location !== "undefined") {
-            // Browsers place location on window
-            return window.location;
-        } else if ((typeof window.window !== "undefined") && (typeof window.window.location !== "undefined")) {
-            // React Native on Android places location on window.window
-            return window.window.location;
-        }
-
+    if (typeof window === "undefined") {
+        // Fallback
         return getDefaultWindowLocation();
     }
 
-    // Fallback
+    if (typeof window.location !== "undefined") {
+        // Browsers place location on window
+        return window.location;
+    }
+
+    if ((typeof window.window !== "undefined") && (typeof window.window.location !== "undefined")) {
+        // React Native on Android places location on window.window
+        return window.window.location;
+    }
+
     return getDefaultWindowLocation();
 }