$.axs -> axs

jdan · Oct 3, 2015 · 845fe51 · 845fe51 · rileyjshaw · Oct 6, 2015
1 parent 048c873
commit 845fe51
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/index.js b/index.js
@@ -112,9 +112,6 @@ class Toolbar {
 }
 
 $(function() {
-    // Attach the global `axs` object from Accessibility Developer Tools to $
-    $.axs = axs;
-
     var bar = new Toolbar();
 
     // TODO: Make this customizable

diff --git a/plugins/a11y-text-wand/index.js b/plugins/a11y-text-wand/index.js
@@ -25,7 +25,7 @@ class A11yTextWand extends Plugin {
         $(document).on("mousemove.wand", function(e) {
             let element = document.elementFromPoint(e.clientX, e.clientY);
 
-            let textAlternative = $.axs.properties.findTextAlternatives(
+            let textAlternative = axs.properties.findTextAlternatives(
                 element, {});
 
             $(".tota11y-outlined").removeClass("tota11y-outlined");

diff --git a/plugins/link-text/index.js b/plugins/link-text/index.js
@@ -75,7 +75,7 @@ class LinkTextPlugin extends Plugin {
             // TODO: Read from `alts` to determine where the text is coming
             // from (for tailored error messages)
             let alts = {};
-            let extractedText = $.axs.properties.findTextAlternatives(
+            let extractedText = axs.properties.findTextAlternatives(
                 el, alts);
 
             if (!this.isDescriptiveText(extractedText)) {

diff --git a/plugins/shared/audit.js b/plugins/shared/audit.js
@@ -5,13 +5,13 @@
 let $ = require("jquery");
 
 function allRuleNames() {
-    return $.axs.AuditRules.getRules().map(rule => rule.name);
+    return axs.AuditRules.getRules().map(rule => rule.name);
 }
 
 // Creates an audit configuration that whitelists a single rule and limits the
 // amount of tests to run
 function createWhitelist(ruleName) {
-    var config = new $.axs.AuditConfiguration();
+    var config = new axs.AuditConfiguration();
     config.showUnsupportedRulesWarning = false;
 
     // Ignore elements that are part of the toolbar
@@ -41,7 +41,7 @@ function patchCollectMatchingElements() {
      * @param {Array.<Element>} collection
      * @param {ShadowRoot=} opt_shadowRoot The nearest ShadowRoot ancestor, if any.
      */
-    $.axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
+    axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
                                                        opt_shadowRoot) {
         if (node.nodeType === Node.ELEMENT_NODE)
             var element = /** @type {Element} */ (node);
@@ -58,7 +58,7 @@ function patchCollectMatchingElements() {
             // code, be sure to run the tests in the browser before committing.
             var shadowRoot = element.shadowRoot || element.webkitShadowRoot;
             if (shadowRoot) {
-                $.axs.AuditRule.collectMatchingElements(shadowRoot,
+                axs.AuditRule.collectMatchingElements(shadowRoot,
                                                         matcher,
                                                         collection,
                                                         shadowRoot);
@@ -73,7 +73,7 @@ function patchCollectMatchingElements() {
             var content = /** @type {HTMLContentElement} */ (element);
             var distributedNodes = content.getDistributedNodes();
             for (var i = 0; i < distributedNodes.length; i++) {
-                $.axs.AuditRule.collectMatchingElements(distributedNodes[i],
+                axs.AuditRule.collectMatchingElements(distributedNodes[i],
                                                         matcher,
                                                         collection,
                                                         opt_shadowRoot);
@@ -90,7 +90,7 @@ function patchCollectMatchingElements() {
             } else {
                 var distributedNodes = shadow.getDistributedNodes();
                 for (var i = 0; i < distributedNodes.length; i++) {
-                    $.axs.AuditRule.collectMatchingElements(distributedNodes[i],
+                    axs.AuditRule.collectMatchingElements(distributedNodes[i],
                                                             matcher,
                                                             collection,
                                                             opt_shadowRoot);
@@ -102,7 +102,7 @@ function patchCollectMatchingElements() {
         // a <shadow> element recurse normally.
         var child = node.firstChild;
         while (child != null) {
-            $.axs.AuditRule.collectMatchingElements(child,
+            axs.AuditRule.collectMatchingElements(child,
                                                     matcher,
                                                     collection,
                                                     opt_shadowRoot);
@@ -119,7 +119,7 @@ function audit(ruleName) {
 
     patchCollectMatchingElements();
 
-    return $.axs.Audit.run(whitelist)
+    return axs.Audit.run(whitelist)
         .filter(result => result.rule.name === ruleName)[0];
 }
 

diff --git a/test/mock-dom/jquery-extensions.js b/test/mock-dom/jquery-extensions.js
@@ -20,6 +20,3 @@ $.fn.labelText = function() {
 $.fn.expandedText = function() {
     return $(this).data("expanded-text");
 };
-
-// Bind the global `axs` object from Accessibility Developer Tools to jQuery
-$.axs = window.axs;