Skip to content

Fix modal event handling for ACF block version 3 #156

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
adambichler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix modal event handling for ACF block version 3 #156

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
282 changes: 157 additions & 125 deletions assets/src/input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,130 +193,6 @@ import { sprintf } from 'sprintf-js';
}

this.escapeHandlerBound = this.escapeHandler.bind(this);

$(document).on('click', '.js-acf-image-aspect-ratio-crop-cancel', () =>
this.closeModal(),
);

$(document)
.off('click', '.js-acf-image-aspect-ratio-crop-reset')
.on('click', '.js-acf-image-aspect-ratio-crop-reset', () => {
this.cropper.reset();
});

$(document)
.off('click', '.js-acf-image-aspect-ratio-crop-crop')
.on('click', '.js-acf-image-aspect-ratio-crop-crop', function() {
var cropData = self.cropper.getData(true);

$('.js-acf-image-aspect-ratio-crop-modal').css(
'max-width',
self.cropper.containerData.width,
);

var cropType = $(field)
.find('.acf-image-uploader-aspect-ratio-crop')
.data('crop_type');

let acfKey = $(field)
.find('.acf-image-uploader-aspect-ratio-crop')
.data('key');

var data = {
id: $(this).data('id'),
aspectRatioHeight: $(this).data('aspect-ratio-height'),
aspectRatioWidth: $(this).data('aspect-ratio-width'),
cropType: $(this).data('crop-type'),
x: cropData.x,
y: cropData.y,
width: cropData.width,
height: cropData.height,
temp_post_id: aiarc.temp_post_id,
key: acfKey,
};

$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', true);
$('.js-acf-image-aspect-ratio-crop-reset').prop('disabled', true);

// prettier-ignore
var loading = '<div class="acf-image-aspect-ratio-crop-modal-loading">' +
'<div class="acf-image-aspect-ratio-crop-modal-loading-icon">' +
'<!-- Icon from https://github.com/google/material-design-icons -->' +
'<!-- Licensed under Apache License 2.0 -->' +
'<!-- Copyright (c) Google Inc. -->' +
'<svg width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg"><path d="M7 2.64V1L4.75 3.18 7 5.36V3.73A3.33 3.33 0 0 1 10.38 7c0 .55-.15 1.07-.4 1.53l.82.8c.44-.68.7-1.47.7-2.33A4.43 4.43 0 0 0 7 2.64zm0 7.63A3.33 3.33 0 0 1 3.62 7c0-.55.15-1.07.4-1.53l-.82-.8c-.44.68-.7 1.47-.7 2.33A4.43 4.43 0 0 0 7 11.36V13l2.25-2.18L7 8.64v1.63z" fill="#FFF" fill-rule="nonzero"/></svg>' +
'</div>' +
'<div class="acf-image-aspect-ratio-crop-modal-loading-text">' +
aiarc_translations.cropping_in_progress +
'</div>' +
'</div>';

// prettier-ignore
var error = '<div class="acf-image-aspect-ratio-crop-modal-error">' +
'<div class="acf-image-aspect-ratio-crop-modal-error-icon">' +
'<!-- Icon from https://github.com/google/material-design-icons -->' +
'<!-- Licensed under Apache License 2.0 -->' +
'<!-- Copyright (c) Google Inc. -->' +
'<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><path d="M1 20.14h20l-10-17-10 17zm10.9-2.69h-1.8v-1.79h1.8v1.8zm0-3.58h-1.8V10.3h1.8v3.58z" fill="#F44336" fill-rule="nonzero"/></svg>' +
'</div>' +
'<div class="acf-image-aspect-ratio-crop-modal-error-text">' +
aiarc_translations.cropping_failed +
'</div>' +
'</div>';

$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').html(
loading,
);
self.cropper.disable();

let options = {};

let url = null;

if (window.aiarc_settings.rest_api_compat === '') {
url = `${window.aiarc.api_root}/aiarc/v1/crop`;
options = {
headers: {
'X-Aiarc-Nonce': window.aiarc.nonce,
'X-WP-Nonce': window.aiarc.wp_rest_nonce,
},
};
}

if (window.aiarc_settings.rest_api_compat === '1') {
url = ajaxurl;
data = qs.stringify({
action: 'acf_image_aspect_ratio_crop_crop',
data: JSON.stringify(data),
});
}

axios
.post(url, data, options)
.then(response => {
self.cropComplete(response.data);
$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', false);
$('.js-acf-image-aspect-ratio-crop-reset').prop(
'disabled',
false,
);
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
})
.catch(response => {
console.error(response);
self.cropper.enable();
$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', false);
$('.js-acf-image-aspect-ratio-crop-reset').prop(
'disabled',
false,
);
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').html(
error,
);
});
});
},

/*
Expand Down Expand Up @@ -627,6 +503,149 @@ import { sprintf } from 'sprintf-js';
}
},

attachCropModalEvents: function() {
var self = this;

// Remove any previously attached handlers to prevent duplicates
$('.js-acf-image-aspect-ratio-crop-cancel').off('click.aiarc');
$('.js-acf-image-aspect-ratio-crop-reset').off('click.aiarc');
$('.js-acf-image-aspect-ratio-crop-crop').off('click.aiarc');

// Attach cancel handler
$('.js-acf-image-aspect-ratio-crop-cancel').on('click.aiarc', function(e) {
e.preventDefault();
self.closeModal();
});

// Attach reset handler
$('.js-acf-image-aspect-ratio-crop-reset').on('click.aiarc', function(e) {
e.preventDefault();
if (self.cropper) {
self.cropper.reset();
}
});

// Attach crop handler
$('.js-acf-image-aspect-ratio-crop-crop').on('click.aiarc', function(e) {
e.preventDefault();

if (!self.cropper) {
console.error('Cropper not initialized');
return;
}

var cropData = self.cropper.getData(true);

$('.js-acf-image-aspect-ratio-crop-modal').css(
'max-width',
self.cropper.containerData.width,
);

var cropType = $(field)
.find('.acf-image-uploader-aspect-ratio-crop')
.data('crop_type');

let acfKey = $(field)
.find('.acf-image-uploader-aspect-ratio-crop')
.data('key');

var data = {
id: $(this).data('id'),
aspectRatioHeight: $(this).data('aspect-ratio-height'),
aspectRatioWidth: $(this).data('aspect-ratio-width'),
cropType: $(this).data('crop-type'),
x: cropData.x,
y: cropData.y,
width: cropData.width,
height: cropData.height,
temp_post_id: aiarc.temp_post_id,
key: acfKey,
};

$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', true);
$('.js-acf-image-aspect-ratio-crop-reset').prop('disabled', true);

// prettier-ignore
var loading = '<div class="acf-image-aspect-ratio-crop-modal-loading">' +
'<div class="acf-image-aspect-ratio-crop-modal-loading-icon">' +
'<!-- Icon from https://github.com/google/material-design-icons -->' +
'<!-- Licensed under Apache License 2.0 -->' +
'<!-- Copyright (c) Google Inc. -->' +
'<svg width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg"><path d="M7 2.64V1L4.75 3.18 7 5.36V3.73A3.33 3.33 0 0 1 10.38 7c0 .55-.15 1.07-.4 1.53l.82.8c.44-.68.7-1.47.7-2.33A4.43 4.43 0 0 0 7 2.64zm0 7.63A3.33 3.33 0 0 1 3.62 7c0-.55.15-1.07.4-1.53l-.82-.8c-.44.68-.7 1.47-.7 2.33A4.43 4.43 0 0 0 7 11.36V13l2.25-2.18L7 8.64v1.63z" fill="#FFF" fill-rule="nonzero"/></svg>' +
'</div>' +
'<div class="acf-image-aspect-ratio-crop-modal-loading-text">' +
aiarc_translations.cropping_in_progress +
'</div>' +
'</div>';

// prettier-ignore
var error = '<div class="acf-image-aspect-ratio-crop-modal-error">' +
'<div class="acf-image-aspect-ratio-crop-modal-error-icon">' +
'<!-- Icon from https://github.com/google/material-design-icons -->' +
'<!-- Licensed under Apache License 2.0 -->' +
'<!-- Copyright (c) Google Inc. -->' +
'<svg width="22" height="22" viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><path d="M1 20.14h20l-10-17-10 17zm10.9-2.69h-1.8v-1.79h1.8v1.8zm0-3.58h-1.8V10.3h1.8v3.58z" fill="#F44336" fill-rule="nonzero"/></svg>' +
'</div>' +
'<div class="acf-image-aspect-ratio-crop-modal-error-text">' +
aiarc_translations.cropping_failed +
'</div>' +
'</div>';

$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').html(
loading,
);
self.cropper.disable();

let options = {};

let url = null;

if (window.aiarc_settings.rest_api_compat === '') {
url = `${window.aiarc.api_root}/aiarc/v1/crop`;
options = {
headers: {
'X-Aiarc-Nonce': window.aiarc.nonce,
'X-WP-Nonce': window.aiarc.wp_rest_nonce,
},
};
}

if (window.aiarc_settings.rest_api_compat === '1') {
url = ajaxurl;
data = qs.stringify({
action: 'acf_image_aspect_ratio_crop_crop',
data: JSON.stringify(data),
});
}

axios
.post(url, data, options)
.then(response => {
self.cropComplete(response.data);
$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', false);
$('.js-acf-image-aspect-ratio-crop-reset').prop(
'disabled',
false,
);
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
})
.catch(response => {
console.error(response);
self.cropper.enable();
$('.js-acf-image-aspect-ratio-crop-crop').prop('disabled', false);
$('.js-acf-image-aspect-ratio-crop-reset').prop(
'disabled',
false,
);
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').empty();
$('.js-acf-image-aspect-ratio-crop-modal-footer-status').html(
error,
);
});
});
},

openModal: function(data) {
var url = data.attachment.attributes.url;
var id = data.attachment.attributes.id;
Expand Down Expand Up @@ -754,6 +773,10 @@ import { sprintf } from 'sprintf-js';
options,
);

// Attach event handlers to the modal buttons
// This needs to happen after the modal DOM is created
this.attachCropModalEvents();

// Test helper
window._acf_image_aspect_ratio_cropper = this.cropper;
},
Expand Down Expand Up @@ -803,9 +826,18 @@ import { sprintf } from 'sprintf-js';
acf.val(this.$input, '');
this.render({});
}

// Remove event listeners before removing DOM
$('.js-acf-image-aspect-ratio-crop-cancel').off('click.aiarc');
$('.js-acf-image-aspect-ratio-crop-reset').off('click.aiarc');
$('.js-acf-image-aspect-ratio-crop-crop').off('click.aiarc');

$('.acf-image-aspect-ratio-crop-backdrop').remove();
document.removeEventListener('keydown', this.escapeHandlerBound);
this.cropper.destroy();

if (this.cropper) {
this.cropper.destroy();
}
},
});

Expand Down