X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=9ac0e9622cbb55f2cbf4387d53c2c607ce943c3c;hb=604b6ebeabc5a0b2e34ddd7d1f68dd0ea5b771af;hp=7752ffb969449d1525681abdfe7cf18aca142490;hpb=2a42179827de132c990409999d7d7dd013d69d03;p=Sone.git diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html index 7752ffb..9ac0e96 100644 --- a/src/main/resources/templates/imageBrowser.html +++ b/src/main/resources/templates/imageBrowser.html @@ -116,13 +116,20 @@ title = $(":input[name='title']:enabled", this.form).val(); description = $(":input[name='description']:enabled", this.form).val(); ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "title": title, "description": description }, function(data) { - if (data && data.success) { - getImage(data.imageId).find(".image-title").text(data.title); - getImage(data.imageId).find(".image-description").html(data.parsedDescription); - getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title); - getImage(data.imageId).find(":input[name='description']").attr("defaultValue", data.description); + var imageElement = getImage(data.imageId); + var imageTitleInput = imageElement.find(":input[name='title']"); + var imageDescriptionInput = imageElement.find(":input[name='description']"); + if (data && data.success) { + imageElement.find(".image-title").text(data.title); + imageElement.find(".image-description").html(data.parsedDescription); + imageTitleInput.prop("defaultValue", data.title); + imageDescriptionInput.prop("defaultValue", data.description); cancelImageEditing(); - } + } else if (data && !data.success) { + imageTitleInput.prop("value", imageTitleInput.prop("defaultValue")); + imageDescriptionInput.prop("value", imageDescriptionInput.prop("defaultValue")); + cancelImageEditing(); + } }); return false; }); @@ -232,13 +239,20 @@ title = $(":input[name='title']:enabled", this.form).val(); description = $(":input[name='description']:enabled", this.form).val(); ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "title": title, "description": description }, function(data) { - if (data && data.success) { - getAlbum(data.albumId).find(".album-title").text(data.title); - getAlbum(data.albumId).find(".album-description").text(data.description); - getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title); - getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description); - cancelAlbumEditing(); - } + if (data) { + var albumTitleField = getAlbum(data.albumId).find(".album-title"); + var albumDescriptionField = getAlbum(data.albumId).find(".album-description"); + if (data.success) { + albumTitleField.text(data.title); + albumDescriptionField.text(data.description); + getAlbum(data.albumId).find(":input[name='title']").prop("defaultValue", title); + getAlbum(data.albumId).find(":input[name='description']").prop("defaultValue", description); + } else { + albumTitleField.prop("value", albumTitleField.prop("defaultValue")); + albumDescriptionField.prop("value", albumDescriptionField.prop("defaultValue")); + } + cancelAlbumEditing(); + } }); return false; }); @@ -327,7 +341,7 @@ <%/foreach> -
<% album.description|parse sone=album.sone>
+<% album.description|parse sone=album.sone|render>
<%if album.sone.local> @@ -339,17 +353,6 @@ - <%if ! album.images.empty> -