From 58cfcd412672d213af01630cf2894ff78a7bf24c Mon Sep 17 00:00:00 2001 From: Chris Schneider Date: Fri, 22 Feb 2013 09:28:35 -0600 Subject: [PATCH] added missing type: attr type: attributes were accidentally omitted during the merge --- .../Html/scripts/LoginPage.js | 6 ++++-- .../Html/scripts/site.js | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js index c6d89a4c11..ca4677e04e 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js +++ b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js @@ -23,7 +23,8 @@ return ApiClient.getUserImageUrl(user.Id, { width: 240, - tag: user.PrimaryImageTag + tag: user.PrimaryImageTag, + type: "Primary" }); }, @@ -73,7 +74,8 @@ var imgUrl = ApiClient.getUserImageUrl(user.Id, { width: 500, - tag: user.PrimaryImageTag + tag: user.PrimaryImageTag, + type: "Primary" }); html += ''; diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js index 67f28aeeba..2660697dc2 100644 --- a/MediaBrowser.WebDashboard/Html/scripts/site.js +++ b/MediaBrowser.WebDashboard/Html/scripts/site.js @@ -474,7 +474,8 @@ var Dashboard = { var imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, { height: 400, - tag: user.PrimaryImageTag + tag: user.PrimaryImageTag, + type: "Primary" }) : "css/images/userFlyoutDefault.png"; @@ -566,7 +567,18 @@ var Dashboard = { Dashboard.showLoadingMsg(); - ApiClient.getDirectoryContents(path, { includeDirectories: true }).done(function (folders) { + var promise; + + if (path === "Network") { + promise = ApiClient.getNetworkComputers(); + } + else if (path) { + promise = ApiClient.getDirectoryContents(path, { includeDirectories: true }); + } else { + promise = ApiClient.getDrives(); + } + + promise.done(function (folders) { $('#txtDirectoryPickerPath', page).val(path || ""); @@ -683,7 +695,8 @@ var Dashboard = { var url = ApiClient.getUserImageUrl(user.Id, { width: 225, - tag: user.PrimaryImageTag + tag: user.PrimaryImageTag, + type: "Primary" }); headerHtml += '';