Merge pull request #16 from drago-96/fix-wizardfinish

Fix spinning circle at the end of config wizard

CONTRIBUTORS.md

@@ -14,6 +14,7 @@
  - [LeoVerto](https://github.com/LeoVerto)
  - [cvium](https://github.com/cvium)
  - [grafixeyehero](https://github.com/grafixeyehero)
+ - [Drago96](https://github.com/drago-96)
 
 # Emby Contributors
 

src/bower_components/emby-webcomponents/router.js

@@ -665,6 +665,13 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
         }
         return page.canGoBack();
     }
+
+    function showDirect(path) {
+        return new Promise(function(resolve, reject) {
+            resolveOnNextShow = resolve, page.show(baseUrl()+path)
+        })
+    }
+
     function show(path, options) {
 
         if (path.indexOf('/') !== 0 && path.indexOf('://') === -1) {
@@ -869,6 +876,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'layoutManager', 'skinM
     appRouter.param = param;
     appRouter.back = back;
     appRouter.show = show;
+    appRouter.showDirect = showDirect;
     appRouter.start = start;
     appRouter.baseUrl = baseUrl;
     appRouter.canGoBack = canGoBack;

src/dashboard/wizardfinishpage.js

@@ -6,7 +6,7 @@ define(["loading"], function(loading) {
             url: ApiClient.getUrl("Startup/Complete"),
             type: "POST"
         }).then(function() {
-            Dashboard.navigate("dashboard.html"), loading.hide()
+            Dashboard.navigate_direct("/dashboard.html"), loading.hide()
         })
     }
     return function(view, params) {
@@ -16,4 +16,4 @@ define(["loading"], function(loading) {
             document.querySelector(".skinHeader").classList.remove("noHomeButtonHeader")
         })
     }
-});
+});

src/scripts/site.js

@@ -89,6 +89,13 @@ var Dashboard = {
                 })
             })
         },
+        navigate_direct: function(path) {
+            return new Promise(function(resolve, reject) {
+                require(["appRouter"], function(appRouter) {
+                    return appRouter.showDirect(path).then(resolve, reject)
+                })
+            })
+        },
         processPluginConfigurationUpdateResult: function() {
             require(["loading", "toast"], function(loading, toast) {
                 loading.hide(), toast(Globalize.translate("MessageSettingsSaved"))