mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fixes #146 - User creation screen - image selection

Browse source
This commit is contained in:
Luke Pulverenti 2013-04-17 12:45:37 -04:00
parent 11efc3c8ab
commit 2e4becdaa4
4 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ApiClient.js
View file

@ -786,7 +786,11 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("null imageType"); 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."); throw new Error("File must be an image.");
} }
@ -1841,7 +1845,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("null name"); 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({ return self.ajax({
type: "GET", type: "GET",
@ -1863,7 +1867,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("null name"); 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({ return self.ajax({
type: "GET", type: "GET",
@ -1875,7 +1879,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
/** /**
Gets a variety of item counts that a studio appears in Gets a variety of item counts that a studio appears in
*/ */
self.getStudiosItemCounts = function (userId, name) { self.getStudioItemCounts = function (userId, name) {
if (!userId) { if (!userId) {
throw new Error("null userId"); throw new Error("null userId");
@ -1885,7 +1889,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
throw new Error("null name"); 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({ return self.ajax({
type: "GET", type: "GET",

6
dashboard-ui/scripts/userimagepage.js
View file

@ -146,7 +146,11 @@
var file = UserImagePage.currentFile; 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; return false;
} }

2
dashboard-ui/userimage.html
View file

@ -27,7 +27,7 @@
<form id="uploadUserImageForm"> <form id="uploadUserImageForm">
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li id="fldNewImage"> <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);" /> <input type="file" accept="image/*" id="uploadUserImage" name="uploadUserImage" onchange="UserImagePage.onFileUploadChange(this);" />
<div id="userImageDropZone" class="imageDropZone"> <div id="userImageDropZone" class="imageDropZone">

2
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <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.Common" version="3.9.43" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" /> <package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
</packages> </packages>