From b65adf700f425e56bf2adea0c121a8f15563608f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 16 Mar 2016 00:03:49 -0400
Subject: [PATCH] update components

---
 .../emby-webcomponents/.bower.json            |  8 +-
 .../emby-webcomponents/router.js              | 90 +++++++++----------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 0bf7cb2f04..d38e858a46 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.1.62",
-  "_release": "1.1.62",
+  "version": "1.1.64",
+  "_release": "1.1.64",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.62",
-    "commit": "47fb2042a7e5b8ea4471c67fc3e9922e29e23f07"
+    "tag": "1.1.64",
+    "commit": "09ad84b364cc201acfa1c7700142e2043bf23db9"
   },
   "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "~1.1.5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js
index c5b24bf52a..edfec6d717 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/router.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/router.js
@@ -1,5 +1,23 @@
 define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'browser', 'pageJs'], function (loading, viewManager, skinManager, pluginManager, backdrop, browser, page) {
 
+    var embyRouter = {
+        showLocalLogin: function (apiClient, serverId, manualLogin) {
+
+            var pageName = manualLogin ? 'manuallogin' : 'login';
+
+            show('/startup/' + pageName + '.html?serverid=' + serverId);
+        },
+        showSelectServer: function () {
+            show('/startup/selectserver.html');
+        },
+        showWelcome: function () {
+            show('/startup/welcome.html');
+        },
+        showSettings: function () {
+            show('/settings/settings.html');
+        }
+    };
+
     var connectionManager;
 
     function redirectToLogin() {
@@ -28,28 +46,28 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
                     result.ApiClient.getPublicUsers().then(function (users) {
 
                         if (users.length) {
-                            show('/startup/login.html?serverid=' + result.Servers[0].Id);
+                            embyRouter.showLocalLogin(result.ApiClient, result.Servers[0].Id);
                         } else {
-                            goToLocalLogin(result.ApiClient, result.Servers[0].Id);
+                            embyRouter.showLocalLogin(result.ApiClient, result.Servers[0].Id, true);
                         }
                     });
                 }
                 break;
             case MediaBrowser.ConnectionState.ServerSelection:
                 {
-                    show('/startup/selectserver.html');
+                    embyRouter.showSelectServer();
                 }
                 break;
             case MediaBrowser.ConnectionState.ConnectSignIn:
                 {
-                    show('/startup/welcome.html');
+                    embyRouter.showWelcome();
                 }
                 break;
             case MediaBrowser.ConnectionState.ServerUpdateNeeded:
                 {
                     require(['alert'], function (alert) {
                         alert(Globalize.translate('core#ServerUpdateNeeded', '<a href="https://emby.media">https://emby.media</a>')).then(function () {
-                            show('/startup/selectserver.html');
+                            embyRouter.showSelectServer();
                         });
                     });
                 }
@@ -59,11 +77,6 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
         }
     }
 
-    function goToLocalLogin(apiClient, serverId) {
-
-        show('/startup/manuallogin.html?serverid=' + serverId);
-    }
-
     var cacheParam = new Date().getTime();
     function loadContentUrl(ctx, next, route, request) {
 
@@ -71,6 +84,7 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
 
         if (url.toLowerCase().indexOf('http') != 0 && url.indexOf('file:') != 0) {
 
+            // Put a slash at the beginning but make sure to avoid a double slash
             if (url.indexOf('/') != 0) {
 
                 url = '/' + url;
@@ -413,14 +427,6 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
         skinManager.getCurrentSkin().setTitle(title);
     }
 
-    function gotoSettings() {
-        show('/settings/settings.html');
-    }
-
-    function selectServer() {
-        show('/startup/selectserver.html');
-    }
-
     function showVideoOsd() {
         var skin = skinManager.getCurrentSkin();
 
@@ -478,33 +484,27 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
 
     setBaseRoute();
 
-    return {
-        addRoute: addRoute,
-        param: param,
-        back: back,
-        show: show,
-        start: start,
-        baseUrl: baseUrl,
-        canGoBack: canGoBack,
-        current: current,
-        redirectToLogin: redirectToLogin,
-        goHome: goHome,
-        gotoSettings: gotoSettings,
-        showItem: showItem,
-        setTitle: setTitle,
-        selectServer: selectServer,
-        showVideoOsd: showVideoOsd,
-        setTransparency: setTransparency,
-        getRoutes: getRoutes,
-
-        pushState: pushState,
-
-        TransparencyLevel: {
-            None: 0,
-            Backdrop: 1,
-            Full: 2
-        },
-        enableNativeHistory: enableNativeHistory
+    embyRouter.addRoute = addRoute;
+    embyRouter.param = param;
+    embyRouter.back = back;
+    embyRouter.show = show;
+    embyRouter.start = start;
+    embyRouter.baseUrl = baseUrl;
+    embyRouter.canGoBack = canGoBack;
+    embyRouter.current = current;
+    embyRouter.redirectToLogin = redirectToLogin;
+    embyRouter.goHome = goHome;
+    embyRouter.showItem = showItem;
+    embyRouter.setTitle = setTitle;
+    embyRouter.setTransparency = setTransparency;
+    embyRouter.getRoutes = getRoutes;
+    embyRouter.pushState = pushState;
+    embyRouter.enableNativeHistory = enableNativeHistory;
+    embyRouter.TransparencyLevel = {
+        None: 0,
+        Backdrop: 1,
+        Full: 2
     };
 
+    return embyRouter;
 });
\ No newline at end of file