Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

refactor(ngAria): DRY camelcase method #10338

Closed
wants to merge 1 commit into from
Closed

refactor(ngAria): DRY camelcase method #10338

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
25 changes: 9 additions & 16 deletions src/ngAria/aria.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,9 @@ function $AriaProvider() {
config = angular.extend(config, newConfig);
};

function camelCase(input) {
return input.replace(/-./g, function(letter, pos) {
return letter[1].toUpperCase();
});
}


function watchExpr(attrName, ariaAttr, negate) {
var ariaCamelName = camelCase(ariaAttr);
return function(scope, elem, attr) {
var ariaCamelName = attr.$normalize(ariaAttr);
if (config[ariaCamelName] && !attr[ariaCamelName]) {
scope.$watch(attr[attrName], function(boolVal) {
if (negate) {
Expand Down Expand Up @@ -178,7 +171,7 @@ function $AriaProvider() {
this.$get = function() {
return {
config: function(key) {
return config[camelCase(key)];
return config[key];
},
$$watchExpr: watchExpr
};
Expand All @@ -194,8 +187,8 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
}])
.directive('ngModel', ['$aria', function($aria) {

function shouldAttachAttr(attr, elem) {
return $aria.config(attr) && !elem.attr(attr);
function shouldAttachAttr(attr, normalizedAttr, elem) {
return $aria.config(normalizedAttr) && !elem.attr(attr);
}

function getShape(attr, elem) {
Expand All @@ -213,7 +206,7 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
require: '?ngModel',
link: function(scope, elem, attr, ngModel) {
var shape = getShape(attr, elem);
var needsTabIndex = shouldAttachAttr('tabindex', elem);
var needsTabIndex = shouldAttachAttr('tabindex', 'tabindex', elem);

function ngAriaWatchModelValue() {
return ngModel.$modelValue;
Expand Down Expand Up @@ -241,7 +234,7 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
switch (shape) {
case 'radio':
case 'checkbox':
if (shouldAttachAttr('aria-checked', elem)) {
if (shouldAttachAttr('aria-checked', 'ariaChecked', elem)) {
scope.$watch(ngAriaWatchModelValue, shape === 'radio' ?
getRadioReaction() : ngAriaCheckboxReaction);
}
Expand All @@ -262,7 +255,7 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
}
break;
case 'multiline':
if (shouldAttachAttr('aria-multiline', elem)) {
if (shouldAttachAttr('aria-multiline', 'ariaMultiline', elem)) {
elem.attr('aria-multiline', true);
}
break;
Expand All @@ -272,15 +265,15 @@ ngAriaModule.directive('ngShow', ['$aria', function($aria) {
elem.attr('tabindex', 0);
}

if (ngModel.$validators.required && shouldAttachAttr('aria-required', elem)) {
if (ngModel.$validators.required && shouldAttachAttr('aria-required', 'ariaRequired', elem)) {
scope.$watch(function ngAriaRequiredWatch() {
return ngModel.$error.required;
}, function ngAriaRequiredReaction(newVal) {
elem.attr('aria-required', !!newVal);
});
}

if (shouldAttachAttr('aria-invalid', elem)) {
if (shouldAttachAttr('aria-invalid', 'ariaInvalid', elem)) {
scope.$watch(function ngAriaInvalidWatch() {
return ngModel.$invalid;
}, function ngAriaInvalidReaction(newVal) {
Expand Down