Router: Fix Redirect for command

1126bdac · Cédric Le Ninivin · de5bc8ec · 1126bdac
Commit 1126bdac authored Jul 16, 2020 by Cédric Le Ninivin
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 9 deletions

gadget/gadget_cribjs_router.js gadget/gadget_cribjs_router.js +7 -9

No files found.
--- a/gadget/gadget_cribjs_router.js
+++ b/gadget/gadget_cribjs_router.js
@@ -70,15 +70,13 @@
    })
    .declareMethod('redirect', function (options) {
-      if (options !== undefined) {
+      if (options !== undefined && options.toExternal) {
-        if (options.toExternal) {
+        window.location.replace(options.url);
-          window.location.replace(options.url);
+        return RSVP.timeout(REDIRECT_TIMEOUT); // timeout if not redirected
-          return RSVP.timeout(REDIRECT_TIMEOUT); // timeout if not redirected
+      }
-        }
+      if (options !== undefined && options.newTab) {
-        if (options.newTab) {
+        window.open(options.url, '_blank');
-          window.open(options.url, '_blank');
+        return;
-          return;
-        }
      }
      else {
        return this.getCommandUrlFor(options)