Core: Moved ARIA methods up with other jQuery core modifications.

diff --git a/ui/ui.core.js b/ui/ui.core.js
index 1ac19b7ff0888837cc03a2c9f5e5e3e4bd418e75..9814dace251e539254e07d20e7dd99c7e0d40262 100644 (file)
--- a/ui/ui.core.js
+++ b/ui/ui.core.js
@@ -94,6 +94,32 @@ $.keyCode = {
        UP: 38
 };
 
+// WAI-ARIA Semantics
+var isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9);
+$.fn.extend({
+       ariaRole : function(role) {
+               // setter?
+               if (role) {
+                       return this.each(function(i, el) {
+                               $(el).attr("role", isFF2 ? "wairole:" + role : role);
+                       });
+               }
+               // getter just returns first jquery member's role string
+               return (this.eq(0).attr("role") || "").replace(/^wairole:/, "");
+       },
+       
+       ariaState : function(state, value) {
+               // setter?
+               if (value !== undefined) 
+                       return this.each(function(i, el) {
+                               isFF2? el.setAttributeNS("http://www.w3.org/2005/07/aaa", "aaa:" + state, value) :
+                                       $(el).attr("aria-" + state, value);
+                       });
+               // getter
+               return this.attr(isFF2? "aaa:"+state : "aria-" + state);
+       }
+});
+
 // $.widget is a factory to create jQuery plugins
 // taking some boilerplate code out of the plugin code
 // created by Scott González and Jörn Zaefferer
@@ -437,31 +463,4 @@ $.ui.mouse.defaults = {
        delay: 0
 };
 
-
-// WAI-ARIA Semantics
-var isFF2 = $.browser.mozilla && (parseFloat($.browser.version) < 1.9);
-$.fn.extend({
-       ariaRole : function(role) {
-               // setter?
-               if (role) {
-                       return this.each(function(i, el) {
-                               $(el).attr("role", isFF2 ? "wairole:" + role : role);
-                       });
-               }
-               // getter just returns first jquery member's role string
-               return (this.eq(0).attr("role") || "").replace(/^wairole:/, "");
-       },
-       
-       ariaState : function(state, value) {
-               // setter?
-               if (value !== undefined) 
-                       return this.each(function(i, el) {
-                               isFF2? el.setAttributeNS("http://www.w3.org/2005/07/aaa", "aaa:" + state, value) :
-                                       $(el).attr("aria-" + state, value);
-                       });
-               // getter
-               return this.attr(isFF2? "aaa:"+state : "aria-" + state);
-       }
-});
-
 })(jQuery);