Skip to content
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

Jump to bottom

[SITES-23452] Further alt text validation improvements for Image Component Alt Text #2821

Closed
wants to merge 2 commits into from
Closed

[SITES-23452] Further alt text validation improvements for Image Component Alt Text #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff0c0f2
[SITES-22335] Selenium flaky test fix - add timeout before rolling out
Jul 22, 2024
9a28610
[SITES-23452] Further alt text validation improvements for Image Comp…
Jul 25, 2024
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
80 changes: 38 additions & 42 deletions ...rc/content/jcr_root/apps/core/wcm/components/image/v3/image/clientlibs/editor/js/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
);
});
$cqFileUpload.on("click", "[coral-fileupload-clear]", function() {
$altTextField.adaptTo("foundation-field").setRequired(false);
altTuple.reset();
captionTuple.reset();
captionTuple.hideCheckbox(true);
Expand All @@ -148,6 +149,7 @@
if (isDecorative) {
altTuple.hideTextfield(isDecorative.checked);
}
$altTextField.adaptTo("foundation-field").setRequired(!isDecorative.checked);
altTuple.hideCheckbox(true);
captionTuple.hideTextfield(false);
captionTuple.hideCheckbox(true);
Expand Down Expand Up @@ -193,7 +195,13 @@
selector: altInputSelector,
validate: function() {
var seededValue = document.querySelector(altInputSelector).getAttribute("data-seeded-value");
var isImageFromPageImageChecked = document.querySelector('coral-checkbox[name="./imageFromPageImage"]').checked;
var imageFromPageImage = document.querySelector('coral-checkbox[name="./imageFromPageImage"]');
var isImageFromPageImageChecked;
if (imageFromPageImage != null) {
isImageFromPageImageChecked = imageFromPageImage.checked;
} else {
isImageFromPageImageChecked = false;
}
var altFromDAM = document.querySelector('coral-checkbox[name="./altValueFromDAM"]');
var isAltFromDAMChecked = altFromDAM.checked;
var isAltFromDAMDisabled = altFromDAM.disabled;
Expand Down Expand Up @@ -604,49 +612,12 @@
mutations.forEach(function(mutation) {
if (mutation.type === "attributes") {
var isAltCheckboxChecked = $(altCheckboxSelector).attr("checked");
var alertIcon = $(altInputAlertIconSelector);
var assetTab = $(assetTabSelector);
var assetTabAlertIcon = $(assetTabAlertIconSelector);
if (mutation.attributeName === "data-seeded-value") {
if (isAltCheckboxChecked) {
if ($(altInputSelector).val()) {
if (alertIcon.length) {
$(altInputSelector).removeClass("is-invalid");
alertIcon.hide();
assetTab.removeClass("is-invalid");
assetTabAlertIcon.hide();
}
} else {
if (alertIcon.length) {
$(altInputSelector).addClass("is-invalid");
alertIcon.show();
assetTab.addClass("is-invalid");
assetTabAlertIcon.show();
}
}
}
}

if (mutation.attributeName === "disabled") {
if ($(altInputSelector).val()) {
if (alertIcon.length) {
$(altInputSelector).removeClass("is-invalid");
alertIcon.hide();
assetTab.removeClass("is-invalid");
assetTabAlertIcon.hide();
}
}
if (mutation.attributeName === "data-seeded-value" && isAltCheckboxChecked) {
toggleAltTextValidity();
}

if (mutation.attributeName === "invalid") {
if (!$(altInputSelector).val()) {
if (alertIcon.length) {
$(altInputSelector).addClass("is-invalid");
alertIcon.show();
assetTab.addClass("is-invalid");
assetTabAlertIcon.show();
}
}
if (["invalid", "disabled"].includes(mutation.attributeName)) {
toggleAltTextValidity();
}
}
});
Expand All @@ -660,4 +631,29 @@
}
}

/**
* Toggles alt text validity based on the value of the alt text field
*/
function toggleAltTextValidity() {
var alertIcon = $(altInputAlertIconSelector);
if (!alertIcon.length) {
return;
}

var assetTab = $(assetTabSelector);
var assetTabAlertIcon = $(assetTabAlertIconSelector);

if ($(altInputSelector).val()) {
$(altInputSelector).removeClass("is-invalid");
alertIcon.hide();
assetTab.removeClass("is-invalid");
assetTabAlertIcon.hide();
} else {
$(altInputSelector).addClass("is-invalid");
alertIcon.show();
assetTab.addClass("is-invalid");
assetTabAlertIcon.show();
}
}

})(jQuery, Granite);
2 changes: 1 addition & 1 deletion ...lenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/page/PageTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ public void testBlueprintPageProperties() throws ClientException, InterruptedExc
propertiesPage.clickTab("blueprint", BlueprintTab.class);

rolloutDialog = blueprintTab.rollout();

Commons.webDriverWait(RequestConstants.WEBDRIVER_WAIT_TIME_MS);
// check rollout now
rolloutDialog.rolloutNow();

Expand Down
Loading