Merge remote-tracking branch 'acheetham/FLUID-4806'

* acheetham/FLUID-4806: FLUID-4806: Fix inappropriate use of $.prop()
michelled · Oct 19, 2012 · 6de0638 · 6de0638
2 parents 32cb323 + 976a3a1
commit 6de0638
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/js/ToggleButton.js b/js/ToggleButton.js
@@ -78,7 +78,7 @@ https://github.com/fluid-project/infusion/raw/master/Infusion-LICENSE.txt
                 button.toggleClass(styles.init, !pressed);
                 button.toggleClass(styles.pressed, pressed);
             }
-            button.prop("aria-pressed", pressed);
+            button.attr("aria-pressed", pressed);
 
             that.tooltip.updateContent(that.tooltipContentFunction(that));
         };

diff --git a/tests/js/TestUtils.js b/tests/js/TestUtils.js
@@ -32,7 +32,7 @@ fluid.registerNamespace("fluid.testUtils");
         jqUnit.expect(12);
         jqUnit.assertEquals("There should be exactly one " + name + " button", 1, buttonEl.length);
         jqUnit.assertEquals(name + " button should have role of 'button'", "button", buttonEl.attr("role"));
-        jqUnit.assertEquals(name + " button should have aria-pressed of 'false' initially", false, buttonEl.prop("aria-pressed"));
+        jqUnit.assertEquals(name + " button should have aria-pressed of 'false' initially", "false", buttonEl.attr("aria-pressed"));
         jqUnit.assertFalse(name + " button should not have the 'pressed' style", buttonEl.hasClass(stylePressed));
 
         var tooltip = fluid.testUtils.getTooltipCheckString(buttonEl, tooltipReleased);
@@ -41,13 +41,13 @@ fluid.registerNamespace("fluid.testUtils");
         jqUnit.assertFalse("After mouseover, " + name + " button should still not have the 'pressed' style", buttonEl.hasClass(stylePressed));
 
         buttonEl.click();
-        jqUnit.assertEquals("After click, " + name + " button should have aria-pressed of 'true'", true, buttonEl.prop("aria-pressed"));
+        jqUnit.assertEquals("After click, " + name + " button should have aria-pressed of 'true'", "true", buttonEl.attr("aria-pressed"));
         jqUnit.assertTrue("While pressed, " + name + " button should have the 'pressed' style", buttonEl.hasClass(stylePressed));
         buttonEl.blur().focus(); // tooltip not updated until 'requested' again
         jqUnit.assertEquals("Tooltip should contain " + tooltipPressed, tooltipPressed, tooltip.text());
 
         buttonEl.click();
-        jqUnit.assertEquals("After another click, " + name + " button should have aria-pressed of 'false' again", false, buttonEl.prop("aria-pressed"));
+        jqUnit.assertEquals("After another click, " + name + " button should have aria-pressed of 'false' again", "false", buttonEl.attr("aria-pressed"));
         jqUnit.assertFalse(name + " button should not have the 'pressed' style", buttonEl.hasClass(stylePressed));
         buttonEl.blur().focus();
         jqUnit.assertEquals("Tooltip should contain " + tooltipReleased + " again", tooltipReleased, tooltip.text());