cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 10:58:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from cvium/fix_userprofile

Browse Source 
Fix user profile regression
This commit is contained in:
Joshua M. Boniface 2019-01-10 21:11:37 -05:00 committed by GitHub
commit 5b21303e26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 107 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -11,6 +11,7 @@
- [AnthonyLavado](https://github.com/anthonylavado)
- [sparky8251](https://github.com/sparky8251)
- [LeoVerto](https://github.com/LeoVerto)
- [cvium](https://github.com/cvium)
# Emby Contributors

162
src/scripts/myprofile.js
View File

@ -1,95 +1,145 @@
define(["scripts/userpasswordpage", "loading", "libraryMenu", "apphost", "emby-linkbutton"], function(Userpasswordpage, loading, libraryMenu, appHost) {
define(["scripts/userpasswordpage", "loading", "libraryMenu", "apphost", "emby-linkbutton"], function (Userpasswordpage, loading, libraryMenu, appHost) {
"use strict";
function reloadUser(page) {
var userId = getParameterByName("userId");
loading.show(), ApiClient.getUser(userId).then(function(user) {
loading.show();
ApiClient.getUser(userId).then(function (user) {
page.querySelector(".username").innerHTML = user.Name;
var uploadUserImage = page.querySelector("#uploadUserImage");
uploadUserImage.value = "", uploadUserImage.dispatchEvent(new CustomEvent("change", {})), libraryMenu.setTitle(user.Name);
var imageUrl, fldImage = page.querySelector("#fldImage");
imageUrl = user.PrimaryImageTag ? ApiClient.getUserImageUrl(user.Id, {
height: 200,
tag: user.PrimaryImageTag,
type: "Primary"
}) : "css/images/logindefault.png", fldImage.classList.remove("hide"), fldImage.innerHTML = "<img width='140px' src='" + imageUrl + "' />";
var showImageEditing = !1;
Dashboard.getCurrentUser().then(function(loggedInUser) {
showImageEditing && appHost.supports("fileinput") && (loggedInUser.Policy.IsAdministrator || user.Policy.EnableUserPreferenceAccess) ? (page.querySelector(".newImageForm").classList.remove("hide"), user.PrimaryImageTag ? page.querySelector("#btnDeleteImage").classList.remove("hide") : page.querySelector("#btnDeleteImage").classList.add("hide")) : (page.querySelector(".newImageForm").classList.add("hide"), page.querySelector("#btnDeleteImage").classList.add("hide"))
}), loading.hide()
})
uploadUserImage.value = "";
uploadUserImage.dispatchEvent(new CustomEvent("change", {}));
libraryMenu.setTitle(user.Name);
var imageUrl = "css/images/logindefault.png";
if (user.PrimaryImageTag) {
ApiClient.getUserImageUrl(user.Id, {
height: 200,
tag: user.PrimaryImageTag,
type: "Primary"
});
}
var fldImage = page.querySelector("#fldImage");
fldImage.classList.remove("hide");
fldImage.innerHTML = "<img width='140px' src='" + imageUrl + "' />";
Dashboard.getCurrentUser().then(function (loggedInUser) {
if (appHost.supports("fileinput") && (loggedInUser.Policy.IsAdministrator || user.Policy.EnableUserPreferenceAccess)) {
page.querySelector(".newImageForm").classList.remove("hide");
if (user.PrimaryImageTag) {
page.querySelector("#btnDeleteImage").classList.remove("hide");
} else {
page.querySelector("#btnDeleteImage").classList.add("hide");
}
} else {
page.querySelector(".newImageForm").classList.add("hide");
page.querySelector("#btnDeleteImage").classList.add("hide");
}
});
loading.hide();
});
}
function onFileReaderError(evt) {
switch (loading.hide(), evt.target.error.code) {
loading.hide();
switch (evt.target.error.code) {
case evt.target.error.NOT_FOUND_ERR:
require(["toast"], function(toast) {
toast(Globalize.translate("FileNotFound"))
require(["toast"], function (toast) {
toast(Globalize.translate("FileNotFound"));
});
break;
case evt.target.error.NOT_READABLE_ERR:
require(["toast"], function(toast) {
toast(Globalize.translate("FileReadError"))
require(["toast"], function (toast) {
toast(Globalize.translate("FileReadError"));
});
break;
case evt.target.error.ABORT_ERR:
break;
default:
require(["toast"], function(toast) {
toast(Globalize.translate("FileReadError"))
})
require(["toast"], function (toast) {
toast(Globalize.translate("FileReadError"));
});
}
}
function onFileReaderAbort(evt) {
loading.hide(), require(["toast"], function(toast) {
toast(Globalize.translate("FileReadCancelled"))
})
loading.hide();
require(["toast"], function (toast) {
toast(Globalize.translate("FileReadCancelled"));
});
}
function setFiles(page, files) {
var file = files[0];
if (!file || !file.type.match("image.*")) return page.querySelector("#userImageOutput").innerHTML = "", page.querySelector("#fldUpload").classList.add("hide"), void(currentFile = null);
if (!file || !file.type.match("image.*")) {
page.querySelector("#userImageOutput").innerHTML = "";
page.querySelector("#fldUpload").classList.add("hide");
return void (currentFile = null);
}
currentFile = file;
var reader = new FileReader;
reader.onerror = onFileReaderError, reader.onloadstart = function() {
page.querySelector("#fldUpload").classList.add("hide")
}, reader.onabort = onFileReaderAbort, reader.onload = function(e) {
var html = ['<img style="max-width:100%;max-height:100%;" src="', e.target.result, '" title="', escape(file.name), '"/>'].join("");
page.querySelector("#userImageOutput").innerHTML = html, page.querySelector("#fldUpload").classList.remove("hide")
}, reader.readAsDataURL(file)
var reader = new FileReader();
reader.onerror = onFileReaderError;
reader.onloadstart = function () {
page.querySelector("#fldUpload").classList.add("hide");
};
reader.onabort = onFileReaderAbort;
reader.onload = function (evt) {
var html = ['<img style="max-width:100%;max-height:100%;" src="', evt.target.result, '" title="', escape(file.name), '"/>'].join("");
page.querySelector("#userImageOutput").innerHTML = html;
page.querySelector("#fldUpload").classList.remove("hide");
};
reader.readAsDataURL(file);
}
function onImageDragOver(e) {
return e.preventDefault(), e.originalEvent.dataTransfer.dropEffect = "Copy", !1
function onImageDragOver(evt) {
evt.preventDefault();
evt.originalEvent.dataTransfer.dropEffect = "Copy";
return false;
}
var currentFile;
return function(view, params) {
return function (view, params) {
reloadUser(view);
new Userpasswordpage(view, params);
view.querySelector("#userImageDropZone").addEventListener("dragOver", onImageDragOver), view.querySelector("#btnDeleteImage").addEventListener("click", function() {
require(["confirm"], function(confirm) {
confirm(Globalize.translate("DeleteImageConfirmation"), Globalize.translate("DeleteImage")).then(function() {
view.querySelector("#userImageDropZone").addEventListener("dragOver", onImageDragOver);
view.querySelector("#btnDeleteImage").addEventListener("click", function () {
require(["confirm"], function (confirm) {
confirm(Globalize.translate("DeleteImageConfirmation"), Globalize.translate("DeleteImage")).then(function () {
loading.show();
var userId = getParameterByName("userId");
ApiClient.deleteUserImage(userId, "primary").then(function() {
loading.hide(), reloadUser(view)
})
})
})
}), view.querySelector(".btnBrowse").addEventListener("click", function() {
view.querySelector("#uploadUserImage").click()
}), view.querySelector(".newImageForm").addEventListener("submit", function(e) {
ApiClient.deleteUserImage(userId, "primary").then(function () {
loading.hide();
reloadUser(view);
});
});
});
});
view.querySelector(".btnBrowse").addEventListener("click", function () {
view.querySelector("#uploadUserImage").click();
});
view.querySelector(".newImageForm").addEventListener("submit", function (evt) {
var file = currentFile;
if (!file) return !1;
if ("image/png" != file.type && "image/jpeg" != file.type && "image/jpeg" != file.type) return !1;
if (!file || "image/png" != file.type && "image/jpeg" != file.type && "image/jpeg" != file.type) {
return false;
}
loading.show();
var userId = getParameterByName("userId");
return ApiClient.uploadUserImage(userId, "Primary", file).then(function() {
loading.hide(), reloadUser(view)
}), e.preventDefault(), !1
}), view.querySelector("#uploadUserImage").addEventListener("change", function(e) {
setFiles(view, e.target.files)
})
}
ApiClient.uploadUserImage(userId, "Primary", file).then(function () {
loading.hide();
reloadUser(view);
});
evt.preventDefault();
return false;
});
view.querySelector("#uploadUserImage").addEventListener("change", function (evt) {
setFiles(view, evt.target.files);
});
};
});