From 2e4becdaa4b9522a7eda0d73d9cf2e69426a474b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 17 Apr 2013 12:45:37 -0400
Subject: [PATCH] fixes #146 - User creation screen - image selection

---
 ApiClient.js                          | 14 +++++++++-----
 dashboard-ui/scripts/userimagepage.js |  6 +++++-
 dashboard-ui/userimage.html           |  2 +-
 packages.config                       |  2 +-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ApiClient.js b/ApiClient.js
index 420b75d93d..bb8de833a5 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -786,7 +786,11 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null imageType");
             }
 
-            if (!file || !file.type.match('image.*')) {
+            if (!file) {
+                throw new Error("File must be an image.");
+            }
+
+            if (file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/jpeg") {
                 throw new Error("File must be an image.");
             }
 
@@ -1841,7 +1845,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
             }
 
-            var url = self.getUrl("Users/{UserId}/Persons/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Persons/" + encodeName(name) + "/Counts");
 
             return self.ajax({
                 type: "GET",
@@ -1863,7 +1867,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
             }
 
-            var url = self.getUrl("Users/{UserId}/Genres/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Genres/" + encodeName(name) + "/Counts");
 
             return self.ajax({
                 type: "GET",
@@ -1875,7 +1879,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
         /**
             Gets a variety of item counts that a studio appears in
         */
-        self.getStudiosItemCounts = function (userId, name) {
+        self.getStudioItemCounts = function (userId, name) {
 
             if (!userId) {
                 throw new Error("null userId");
@@ -1885,7 +1889,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null name");
             }
 
-            var url = self.getUrl("Users/{UserId}/Studios/" + encodeName(name) + "/Counts");
+            var url = self.getUrl("Users/" + userId + "/Studios/" + encodeName(name) + "/Counts");
 
             return self.ajax({
                 type: "GET",
diff --git a/dashboard-ui/scripts/userimagepage.js b/dashboard-ui/scripts/userimagepage.js
index 18d2fdf4b7..a8ef591bd3 100644
--- a/dashboard-ui/scripts/userimagepage.js
+++ b/dashboard-ui/scripts/userimagepage.js
@@ -146,7 +146,11 @@
 
         var file = UserImagePage.currentFile;
 
-        if (!file || !file.type.match('image.*')) {
+        if (!file) {
+            return false;
+        }
+
+        if (file.type != "image/png" && file.type != "image/jpeg" && file.type != "image/jpeg") {
             return false;
         }
 
diff --git a/dashboard-ui/userimage.html b/dashboard-ui/userimage.html
index a2d02eed2d..85e95b3596 100644
--- a/dashboard-ui/userimage.html
+++ b/dashboard-ui/userimage.html
@@ -27,7 +27,7 @@
                 <form id="uploadUserImageForm">
                     <ul data-role="listview" class="ulForm">
                         <li id="fldNewImage">
-                            <p>1:1 Aspect Ratio Recommended</p>
+                            <p>1:1 Aspect Ratio Recommended. JPG/PNG only.</p>
                             <input type="file" accept="image/*" id="uploadUserImage" name="uploadUserImage" onchange="UserImagePage.onFileUploadChange(this);" />
 
                             <div id="userImageDropZone" class="imageDropZone">
diff --git a/packages.config b/packages.config
index a4c910f732..e88d7b2d28 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.78" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.79" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
 </packages>
\ No newline at end of file