jQuery UI Development

Timestamp:

11/14/08 20:29:08 (16 months ago)

Author:

scott.gonzalez

Message:

Core: Fixed #3562: Modify .removeAttr() to work on ARIA properties in FF2.

Location:

trunk

Files:

• tests/core.js (modified) (1 diff)
• ui/ui.core.js (modified) (2 diffs)

trunk/tests/core.js

@@ -57 +57 @@
 
 test("attr - aria", function() {
-        expect(4);
+        expect(6);
         
-        ok(!$('#aria').attr('role'), 'role is empty via attr');
-        equals($('#aria').attr('role', 'tablist').attr('role'), 'tablist', 'role is tablist');
-        equals($('#aria').attr('aria-expanded', true).attr('aria-expanded'), 'true', 'aria expanded is true');
-        equals($('#aria').attr('aria-expanded', false).attr('aria-expanded'), 'false', 'aria expanded is false');
+        var el = $('#aria');
+        
+        ok(!el.attr('role'), 'role is empty via attr');
+        equals(el.attr('role', 'tablist').attr('role'), 'tablist', 'role is tablist');
+        
+        equals(el.attr('aria-expanded'), undefined, 'aria expanded is undefined');
+        
+        el.attr('aria-expanded', true);
+        equals(el.attr('aria-expanded'), 'true', 'aria expanded is true');
+        
+        el.removeAttr('aria-expanded');
+        equals(el.attr('aria-expanded'), undefined, 'aria expanded is undefined after removing');
+        
+        el.attr('aria-expanded', false);
+        equals(el.attr('aria-expanded'), 'false', 'aria expanded is false');
 });
 

trunk/ui/ui.core.js

@@ -136 +136 @@
 
 // WAI-ARIA normalization
-// tweak $.attr for FF2 implementation
 if (isFF2) {
         var attr = $.attr,
+                removeAttr = $.fn.removeAttr,
+                ariaNS = "http://www.w3.org/2005/07/aaa",
                 ariaState = /^aria-/,
                 ariaRole = /^wairole:/;
@@ -151 +152 @@
                         : (ariaState.test(name)
                                 ? (set
-                                        ? elem.setAttributeNS("http://www.w3.org/2005/07/aaa",
+                                        ? elem.setAttributeNS(ariaNS,
                                                 name.replace(ariaState, "aaa:"), value)
                                         : attr.call(this, elem, name.replace(ariaState, "aaa:")))
                                 : attr.apply(this, arguments)));
+        };
+        
+        $.fn.removeAttr = function(name) {
+                return (ariaState.test(name)
+                        ? this.each(function() {
+                                this.removeAttributeNS(ariaNS, name.replace(ariaState, ""));
+                        }) : removeAttr.call(this, name));
         };
 }