michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added missing type: attr

Browse Source 
type: attributes were accidentally omitted during the merge
This commit is contained in:
Chris Schneider 2013-02-22 09:28:35 -06:00
parent 047e97cb22
commit 58cfcd4126
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.WebDashboard/Html/scripts/LoginPage.js
View File

@ -23,7 +23,8 @@
return ApiClient.getUserImageUrl(user.Id, { return ApiClient.getUserImageUrl(user.Id, {
width: 240, width: 240,
tag: user.PrimaryImageTag tag: user.PrimaryImageTag,
type: "Primary"
}); });
}, },
@ -73,7 +74,8 @@
var imgUrl = ApiClient.getUserImageUrl(user.Id, { var imgUrl = ApiClient.getUserImageUrl(user.Id, {
width: 500, width: 500,
tag: user.PrimaryImageTag tag: user.PrimaryImageTag,
type: "Primary"
}); });
html += '<img src="' + imgUrl + '" />'; html += '<img src="' + imgUrl + '" />';

19
MediaBrowser.WebDashboard/Html/scripts/site.js
View File

@ -474,7 +474,8 @@ var Dashboard = {
var imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, { var imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, {
height: 400, height: 400,
tag: user.PrimaryImageTag tag: user.PrimaryImageTag,
type: "Primary"
}) : "css/images/userFlyoutDefault.png"; }) : "css/images/userFlyoutDefault.png";
@ -566,7 +567,18 @@ var Dashboard = {
Dashboard.showLoadingMsg(); 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 || ""); $('#txtDirectoryPickerPath', page).val(path || "");
@ -683,7 +695,8 @@ var Dashboard = {
var url = ApiClient.getUserImageUrl(user.Id, { var url = ApiClient.getUserImageUrl(user.Id, {
width: 225, width: 225,
tag: user.PrimaryImageTag tag: user.PrimaryImageTag,
type: "Primary"
}); });
headerHtml += '<img src="' + url + '" />'; headerHtml += '<img src="' + url + '" />';