Skip to content

XWIKI-23573: Errors when setting a previously uploaded image as avatar #4681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −3
Open

XWIKI-23573: Errors when setting a previously uploaded image as avatar #4681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...m-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,8 @@ $xwiki.jsx.use($attachmentPickerDocName)
/** AJAX deletion of attachments. */
onDelete : function(event) {
event.stop();
deleteTool = event.element();
let deleteTool = event.element();
if (!deleteTool.hasClassName('btn')) deleteTool = deleteTool.up('.btn');
Comment on lines +640 to +641
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd try to use the native API:

Suggested change
let deleteTool = event.element();
if (!deleteTool.hasClassName('btn')) deleteTool = deleteTool.up('.btn');
const deleteTool = event.target.closest('.btn');

See https://developer.mozilla.org/en-US/docs/Web/API/Event/target and https://developer.mozilla.org/en-US/docs/Web/API/Element/closest (note that closest starts from the element is being called on).

if (!deleteTool.disabled) {
new XWiki.widgets.ConfirmedAjaxRequest(
deleteTool.readAttribute('href'),
Expand Down Expand Up @@ -680,7 +681,8 @@ $xwiki.jsx.use($attachmentPickerDocName)
/** Update the property with the selected value without reloading the page. */
onSelect : function(event) {
event.stop();
var targetElement = event.element();
let targetElement = event.element();
if (!targetElement.hasClassName('btn')) targetElement = targetElement.up('.btn');
Comment on lines +684 to +685
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let targetElement = event.element();
if (!targetElement.hasClassName('btn')) targetElement = targetElement.up('.btn');
const targetElement = event.target.closest('.btn');

var attachmentName = targetElement.up('.gallery_attachmentbox').down('.gallery_attachmenttitle').title;
var imageSource = targetElement.up('.gallery_attachmentbox.gallery_image');
if (imageSource) {
Expand All @@ -695,7 +697,7 @@ $xwiki.jsx.use($attachmentPickerDocName)
if (this.directSave) {
// save via ajax
if (!targetElement.disabled) {
new Ajax.Request(event.element().href, {
new Ajax.Request(targetElement.href, {
onCreate : function() {
targetElement.disabled = true;
targetElement._x_notif = new XWiki.widgets.Notification("$services.localization.render('core.widgets.confirmationBox.notification.inProgress')", 'inprogress');
Expand Down