Do not redirect if no url given

Juicy · Oct 1, 2014 · 8824578 · 8824578
1 parent 6b8d4fc
commit 8824578
Showing 1 changed file with 19 additions and 22 deletions.
diff --git a/src/juicy-redirect.html b/src/juicy-redirect.html
@@ -17,32 +17,29 @@
                     break;
             }
         };
-        JuicyRedirectElementPrototype.redirect = function(newVal){
-            var url;
-            if(newVal == "current") {
+        JuicyRedirectElementPrototype.redirect = function(url){
+            if(!url){
+                return false;
+            }
+            if(url == "current") {
                 url = window.location.href;
             }
-            else {
-                url = newVal;
+            if(this.hasAttribute("history")) {
+                history.pushState(null, null, url);
+                this.dispatchEvent(
+                    new CustomEvent(
+                        "juicy-redirect-pushstate",
+                        {
+                            "detail":{"url":url},
+                            "bubbles": true
+                        }
+                    )
+                );
             }
-            if(url != "") {
-                if(this.hasAttribute("history")) {
-                    history.pushState(null, null, url);
-                    this.dispatchEvent(
-                        new CustomEvent(
-                            "juicy-redirect-pushstate",
-                            {
-                                "detail":{"url":url},
-                                "bubbles": true
-                            }
-                        )
-                    );
-                }
-                else {
-                    window.location = url;
-                }
-                this.setAttribute("url", "");
+            else {
+                window.location = url;
             }
+            this.setAttribute("url", "");
             return url;
         }