added missing type: attr

type: attributes were accidentally omitted during the merge

2 files changed, 20 insertions, 5 deletions

diff --git a/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js b/MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
index c6d89a4c1..ca4677e04 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 += '<img src="' + imgUrl + '" />';
diff --git a/MediaBrowser.WebDashboard/Html/scripts/site.js b/MediaBrowser.WebDashboard/Html/scripts/site.js
index 67f28aeeb..2660697dc 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 += '<img src="' + url + '" />';