Commit 0b8471d6 by Matjaz Gregoric Committed by E. Kolpakov

Toggle aria-disabled attribute on New Course/New Library buttons.

parent f874c052
...@@ -70,7 +70,7 @@ define(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape", "js/vie ...@@ -70,7 +70,7 @@ define(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape", "js/vie
var makeCancelHandler = function (addType) { var makeCancelHandler = function (addType) {
return function(e) { return function(e) {
e.preventDefault(); e.preventDefault();
$('.new-'+addType+'-button').removeClass('is-disabled').attr('aria-disabled', false);; $('.new-'+addType+'-button').removeClass('is-disabled').attr('aria-disabled', false);
$('.wrapper-create-'+addType).removeClass('is-shown'); $('.wrapper-create-'+addType).removeClass('is-shown');
// Clear out existing fields and errors // Clear out existing fields and errors
$('#create-'+addType+'-form input[type=text]').val(''); $('#create-'+addType+'-form input[type=text]').val('');
...@@ -117,14 +117,14 @@ define(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape", "js/vie ...@@ -117,14 +117,14 @@ define(["domReady", "jquery", "underscore", "js/utils/cancel_on_escape", "js/vie
CreateLibraryUtils.createLibrary(lib_info, function (errorMessage) { CreateLibraryUtils.createLibrary(lib_info, function (errorMessage) {
$('.create-library .wrap-error').addClass('is-shown'); $('.create-library .wrap-error').addClass('is-shown');
$('#library_creation_error').html('<p>' + errorMessage + '</p>'); $('#library_creation_error').html('<p>' + errorMessage + '</p>');
$('.new-library-save').addClass('is-disabled'); $('.new-library-save').addClass('is-disabled').attr('aria-disabled', true);
}); });
}; };
var addNewLibrary = function (e) { var addNewLibrary = function (e) {
e.preventDefault(); e.preventDefault();
$('.new-library-button').addClass('is-disabled'); $('.new-library-button').addClass('is-disabled').attr('aria-disabled', true);
$('.new-library-save').addClass('is-disabled'); $('.new-library-save').addClass('is-disabled').attr('aria-disabled', true);
var $newLibrary = $('.wrapper-create-library').addClass('is-shown'); var $newLibrary = $('.wrapper-create-library').addClass('is-shown');
var $cancelButton = $newLibrary.find('.new-library-cancel'); var $cancelButton = $newLibrary.find('.new-library-cancel');
var $libraryName = $('.new-library-name'); var $libraryName = $('.new-library-name');
......
...@@ -4,14 +4,19 @@ ...@@ -4,14 +4,19 @@
define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
function ($, _, gettext, ViewUtils) { function ($, _, gettext, ViewUtils) {
return function (selectors, classes) { return function (selectors, classes) {
var validateTotalCourseItemsLength, setNewCourseFieldInErr, hasInvalidRequiredFields, var toggleSaveButton, validateTotalCourseItemsLength, setNewCourseFieldInErr,
createCourse, validateFilledFields, configureHandlers; hasInvalidRequiredFields, createCourse, validateFilledFields, configureHandlers;
var validateRequiredField = ViewUtils.validateRequiredField; var validateRequiredField = ViewUtils.validateRequiredField;
var validateURLItemEncoding = ViewUtils.validateURLItemEncoding; var validateURLItemEncoding = ViewUtils.validateURLItemEncoding;
var keyLengthViolationMessage = gettext('The combined length of the organization, course number, and course run fields cannot be more than <%=limit%> characters.'); var keyLengthViolationMessage = gettext('The combined length of the organization, course number, and course run fields cannot be more than <%=limit%> characters.');
toggleSaveButton = function (is_enabled) {
var is_disabled = !is_enabled;
$(selectors.save).toggleClass(classes.disabled, is_disabled).attr('aria-disabled', is_disabled);
};
// Ensure that org, course_num and run passes checkTotalKeyLengthViolations // Ensure that org, course_num and run passes checkTotalKeyLengthViolations
validateTotalCourseItemsLength = function () { validateTotalCourseItemsLength = function () {
ViewUtils.checkTotalKeyLengthViolations( ViewUtils.checkTotalKeyLengthViolations(
...@@ -25,14 +30,14 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -25,14 +30,14 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
if (msg) { if (msg) {
el.addClass(classes.error); el.addClass(classes.error);
el.children(selectors.tipError).addClass(classes.showing).removeClass(classes.hiding).text(msg); el.children(selectors.tipError).addClass(classes.showing).removeClass(classes.hiding).text(msg);
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
else { else {
el.removeClass(classes.error); el.removeClass(classes.error);
el.children(selectors.tipError).addClass(classes.hiding).removeClass(classes.showing); el.children(selectors.tipError).addClass(classes.hiding).removeClass(classes.showing);
// One "error" div is always present, but hidden or shown // One "error" div is always present, but hidden or shown
if ($(selectors.error).length === 1) { if ($(selectors.error).length === 1) {
$(selectors.save).removeClass(classes.disabled); toggleSaveButton(true);
} }
} }
}; };
...@@ -94,7 +99,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -94,7 +99,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
setNewCourseFieldInErr($ele.parent(), error); setNewCourseFieldInErr($ele.parent(), error);
validateTotalCourseItemsLength(); validateTotalCourseItemsLength();
if (!validateFilledFields()) { if (!validateFilledFields()) {
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
}); });
} }
...@@ -105,7 +110,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -105,7 +110,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
setNewCourseFieldInErr($name.parent(), error); setNewCourseFieldInErr($name.parent(), error);
validateTotalCourseItemsLength(); validateTotalCourseItemsLength();
if (!validateFilledFields()) { if (!validateFilledFields()) {
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
}); });
}; };
......
...@@ -5,14 +5,19 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -5,14 +5,19 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
function ($, _, gettext, ViewUtils) { function ($, _, gettext, ViewUtils) {
"use strict"; "use strict";
return function (selectors, classes) { return function (selectors, classes) {
var validateTotalKeyLength, setNewLibraryFieldInErr, hasInvalidRequiredFields, var toggleSaveButton, validateTotalKeyLength, setNewLibraryFieldInErr,
createLibrary, validateFilledFields, configureHandlers; hasInvalidRequiredFields, createLibrary, validateFilledFields, configureHandlers;
var validateRequiredField = ViewUtils.validateRequiredField; var validateRequiredField = ViewUtils.validateRequiredField;
var validateURLItemEncoding = ViewUtils.validateURLItemEncoding; var validateURLItemEncoding = ViewUtils.validateURLItemEncoding;
var keyLengthViolationMessage = gettext("The combined length of the organization and library code fields cannot be more than <%=limit%> characters."); var keyLengthViolationMessage = gettext("The combined length of the organization and library code fields cannot be more than <%=limit%> characters.");
toggleSaveButton = function (is_enabled) {
var is_disabled = !is_enabled;
$(selectors.save).toggleClass(classes.disabled, is_disabled).attr('aria-disabled', is_disabled);
};
// Ensure that org/librarycode passes validateTotalKeyLength check // Ensure that org/librarycode passes validateTotalKeyLength check
validateTotalKeyLength = function () { validateTotalKeyLength = function () {
ViewUtils.checkTotalKeyLengthViolations( ViewUtils.checkTotalKeyLengthViolations(
...@@ -26,14 +31,14 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -26,14 +31,14 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
if (message) { if (message) {
element.addClass(classes.error); element.addClass(classes.error);
element.children(selectors.tipError).addClass(classes.showing).removeClass(classes.hiding).text(message); element.children(selectors.tipError).addClass(classes.showing).removeClass(classes.hiding).text(message);
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
else { else {
element.removeClass(classes.error); element.removeClass(classes.error);
element.children(selectors.tipError).addClass(classes.hiding).removeClass(classes.showing); element.children(selectors.tipError).addClass(classes.hiding).removeClass(classes.showing);
// One "error" div is always present, but hidden or shown // One "error" div is always present, but hidden or shown
if ($(selectors.error).length === 1) { if ($(selectors.error).length === 1) {
$(selectors.save).removeClass(classes.disabled); toggleSaveButton(true);
} }
} }
}; };
...@@ -101,7 +106,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -101,7 +106,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
setNewLibraryFieldInErr($element.parent(), error); setNewLibraryFieldInErr($element.parent(), error);
validateTotalKeyLength(); validateTotalKeyLength();
if (!validateFilledFields()) { if (!validateFilledFields()) {
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
}); });
} }
...@@ -112,7 +117,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"], ...@@ -112,7 +117,7 @@ define(["jquery", "underscore", "gettext", "js/views/utils/view_utils"],
setNewLibraryFieldInErr($name.parent(), error); setNewLibraryFieldInErr($name.parent(), error);
validateTotalKeyLength(); validateTotalKeyLength();
if (!validateFilledFields()) { if (!validateFilledFields()) {
$(selectors.save).addClass(classes.disabled); toggleSaveButton(false);
} }
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment