From b96516ef877bb10379ae47cf18fdb980cf2a3251 Mon Sep 17 00:00:00 2001
From: Marcy Sutton <marcy@substantial.com>
Date: Mon, 17 Nov 2014 17:12:50 -0800
Subject: [PATCH] feat(mdAria): Checks child nodes for aria-label

Closes #567
---
 src/core/services/aria/aria.js      | 25 +++++++++++++++++++---
 src/core/services/aria/aria.spec.js | 33 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/core/services/aria/aria.spec.js

diff --git a/src/core/services/aria/aria.js b/src/core/services/aria/aria.js
index 40e96ae016c..6d4fc5a5ca0 100644
--- a/src/core/services/aria/aria.js
+++ b/src/core/services/aria/aria.js
@@ -13,14 +13,28 @@ function AriaService($$rAF, $log) {
   };
 
   /**
-   * Check if expected attribute has been specified on the target element
+   * Check if expected attribute has been specified on the target element or child
    * @param element
    * @param attrName
    * @param {optional} defaultValue What to set the attr to if no value is found
    */
   function expect(element, attrName, defaultValue) {
-    var node = element[0];
-    if (!node.hasAttribute(attrName)) {
+    var node = element[0],
+        hasChildren = node.hasChildNodes(),
+        childHasAttribute = false;
+
+    if(hasChildren) {
+      var children = node.childNodes;
+      for(var i=0; i<children.length; i++){
+        var child = children[i];
+        if(child.nodeType === 1 && child.hasAttribute(attrName)) {
+          if(!isHidden(child)){
+            childHasAttribute = true;
+          }
+        }
+      }
+    }
+    if (!node.hasAttribute(attrName) && !childHasAttribute) {
 
       defaultValue = angular.isString(defaultValue) && defaultValue.trim() || '';
       if (defaultValue.length) {
@@ -47,5 +61,10 @@ function AriaService($$rAF, $log) {
     });
   }
 
+  function isHidden(el) {
+    var style = el.currentStyle ? el.currentStyle :
+                          getComputedStyle(el, null);
+    return (style.display === 'none');
+  }
 }
 })();
diff --git a/src/core/services/aria/aria.spec.js b/src/core/services/aria/aria.spec.js
new file mode 100644
index 00000000000..a6eb8c7d5aa
--- /dev/null
+++ b/src/core/services/aria/aria.spec.js
@@ -0,0 +1,33 @@
+describe('$mdAria service', function() {
+  beforeEach(module('material.core'));
+
+  describe('expecting attributes', function(){
+    it('should warn if element is missing text', inject(function($compile, $rootScope, $log, $mdAria) {
+      spyOn($log, 'warn');
+      var button = $compile('<button><md-icon></md-icon></button>')($rootScope);
+
+      $mdAria.expect(button, 'aria-label');
+
+      expect($log.warn).toHaveBeenCalled();
+    }));
+
+    it('should not warn if child element has attribute', inject(function($compile, $rootScope, $log, $mdAria) {
+      spyOn($log, 'warn');
+      var button = $compile('<button><md-icon aria-label="text"></md-icon></button>')($rootScope);
+
+      $mdAria.expect(button, 'aria-label');
+
+      expect($log.warn).not.toHaveBeenCalled();
+    }));
+
+    xit('should warn if child with attribute is hidden', inject(function($compile, $rootScope, $log, $mdAria) {
+      spyOn($log, 'warn');
+      var button = $compile('<button><md-icon aria-label="text" style="display: none;"></md-icon></button>')($rootScope);
+
+      $mdAria.expect(button, 'aria-label');
+
+      expect($log.warn).toHaveBeenCalled();
+    }));
+  });
+
+});