Skip to content
Permalink
Browse files

Revert "Widget: Stop setting ui-state-disabled and aria by default on…

… setting disabled option." This needs to wait for a major release.

This reverts commit 4d67f4f.
  • Loading branch information
scottgonzalez committed Mar 14, 2013
1 parent 38fce3f commit 23771d38ba9d2663f6db0243c8e992dc7ff6844a
@@ -14,15 +14,10 @@ test( "destroy", function() {
});

test( "enable/disable", function() {
expect( 7 );
expect( 4 );
var element = $( "#list1" ).accordion();
state( element, 1, 0, 0 );
element.accordion( "disable" );

ok( element.hasClass( "ui-state-disabled" ), "element gets ui-state-disabled" );
equal( element.attr( "aria-disabled" ), "true", "element gets aria-disabled" );
ok( element.hasClass( "ui-accordion-disabled" ), "element gets ui-accordion-disabled" );

// event does nothing
element.find( ".ui-accordion-header" ).eq( 1 ).trigger( "click" );
state( element, 1, 0, 0 );
@@ -88,20 +88,17 @@ asyncTest( "delay", function() {
});

asyncTest( "disabled", function() {
expect( 5 );
expect( 2 );
var element = $( "#autocomplete" ).autocomplete({
source: data,
delay: 0
delay: 0,
disabled: true
}),
menu = element.autocomplete( "disable" ).autocomplete( "widget" );
menu = element.autocomplete( "widget" );
element.val( "ja" ).keydown();

ok( menu.is( ":hidden" ) );

ok( !element.is( ".ui-state-disabled" ), "element doesn't get ui-state-disabled" );
ok( !element.attr( "aria-disabled" ), "element doesn't get aria-disabled" );
ok( menu.is( ".ui-autocomplete-disabled" ), "element gets ui-autocomplete-disabled" );

setTimeout(function() {
ok( menu.is( ":hidden" ) );
start();
@@ -3,26 +3,19 @@
*/
(function($) {

module( "button: options" );
module("button: options");

test( "disabled, explicit value", function() {
expect( 9 );

var element = $( "#radio01" ).button({ disabled: false });
deepEqual( element.button( "option", "disabled" ), false, "disabled option set to false" );
deepEqual( element.prop( "disabled" ), false, "element is disabled" );

ok( !element.button( "widget" ).hasClass( "ui-state-disabled" ), "element gets ui-state-disabled" );
ok( !element.button( "widget" ).hasClass( "ui-button-disabled" ), "element gets ui-button-disabled" );

element = $( "#radio02" ).button({ disabled: true });

ok( element.button( "widget" ).hasClass( "ui-state-disabled" ), "element gets ui-state-disabled" );
ok( !element.button( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.button( "widget" ).hasClass( "ui-button-disabled" ), "element gets ui-button-disabled" );
test("disabled, explicit value", function() {
expect( 4 );
$("#radio01").button({ disabled: false });
deepEqual(false, $("#radio01").button("option", "disabled"),
"disabled option set to false");
deepEqual(false, $("#radio01").prop("disabled"), "element is disabled");

deepEqual( element.button( "option", "disabled" ), true, "disabled option set to true" );
deepEqual( element.prop( "disabled" ), true, "element is not disabled" );
$("#radio02").button({ disabled: true });
deepEqual(true, $("#radio02").button("option", "disabled"),
"disabled option set to true");
deepEqual(true, $("#radio02").prop("disabled"), "element is not disabled");
});

test("disabled, null", function() {
@@ -101,13 +101,11 @@ test("#4980: Destroy should place element back in original DOM position", functi
});

test( "enable/disable disabled", function() {
expect( 4 );
expect( 2 );
var element = $( "<div></div>" ).dialog();
element.dialog( "disable" );
equal(element.dialog( "option", "disabled" ), false, "disable method doesn't do anything" );
ok( !element.dialog( "widget" ).hasClass( "ui-dialog-disabled" ), "disable method doesn't add ui-dialog-disabled class" );
ok( !element.dialog( "widget" ).hasClass( "ui-state-disabled" ), "disable method doesn't add ui-state-disabled class" );
ok( !element.dialog( "widget" ).attr( "aria-disabled" ), "disable method doesn't add aria-disabled" );
});

test("close", function() {
@@ -74,29 +74,25 @@ test( "enable", function() {
});

test( "disable", function() {
expect( 10 );
expect( 7 );

element = $( "#draggable2" ).draggable({ disabled: false });
element = $("#draggable2").draggable({ disabled: false });
TestHelpers.draggable.shouldMove( element, ".draggable({ disabled: false })" );

element.draggable( "disable" );
element.draggable("disable");
TestHelpers.draggable.shouldNotMove( element, ".draggable('disable')" );
equal( element.draggable( "option", "disabled" ), true, "disabled option getter" );

element.draggable( "destroy" );
element.draggable("destroy");
element.draggable({ disabled: false });
TestHelpers.draggable.shouldMove( element, ".draggable({ disabled: false })" );

element.draggable( "option", "disabled", true );
equal( element.draggable( "option", "disabled" ), true, "disabled option setter" );
TestHelpers.draggable.shouldNotMove( element, ".draggable('option', 'disabled', true)" );

ok( !element.draggable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
ok( !element.draggable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.draggable( "widget" ).hasClass( "ui-draggable-disabled" ), "element gets ui-draggable-disabled" );

var expected = element.draggable(),
actual = expected.draggable( "disable" );
actual = expected.draggable("disable");
equal( actual, expected, "disable is chainable" );
});

@@ -63,29 +63,26 @@ test("enable", function() {
equal(actual, expected, "enable is chainable");
});

test( "disable", function() {
expect( 10 );
test("disable", function() {
expect(7);

var actual, expected,
element = $( "#droppable1" ).droppable({ disabled: false });
var el, actual, expected;

el = $("#droppable1").droppable({ disabled: false });
TestHelpers.droppable.shouldDrop();
element.droppable( "disable" );
el.droppable("disable");
TestHelpers.droppable.shouldNotDrop();
equal( element.droppable( "option", "disabled" ), true, "disabled option getter" );
element.droppable( "destroy" );
element.droppable({ disabled: false });
equal(el.droppable("option", "disabled"), true, "disabled option getter");
el.droppable("destroy");
el.droppable({ disabled: false });
TestHelpers.droppable.shouldDrop();
element.droppable( "option", "disabled", true );
ok( !element.droppable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
ok( !element.droppable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.droppable( "widget" ).hasClass( "ui-droppable-disabled" ), "element gets ui-droppable-disabled" );
equal( element.droppable( "option", "disabled" ), true, "disabled option setter" );
el.droppable("option", "disabled", true);
equal(el.droppable("option", "disabled"), true, "disabled option setter");
TestHelpers.droppable.shouldNotDrop();

expected = $( "<div></div>" ).droppable();
actual = expected.droppable( "disable" );
equal( actual, expected, "disable is chainable" );
expected = $("<div></div>").droppable(),
actual = expected.droppable("disable");
equal(actual, expected, "disable is chainable");
});

})(jQuery);
@@ -7,16 +7,6 @@ test( "destroy", function() {
});
});

test( "disable", function() {
expect( 3 );

var element = $( "#progressbar" ).progressbar().progressbar( "disable" );

ok( element.progressbar( "widget" ).hasClass( "ui-state-disabled" ), "element gets ui-state-disabled" );
ok( element.progressbar( "widget" ).attr( "aria-disabled" ), "element gets aria-disabled" );
ok( element.progressbar( "widget" ).hasClass( "ui-progressbar-disabled" ), "element gets ui-progressbar-disabled" );
});

test( "value", function() {
expect( 3 );

@@ -3,19 +3,10 @@
*/
(function($) {

module( "resizable: methods" );
module("resizable: methods");

test( "disable", function() {
expect( 5 );

var element = $( "#resizable1" ).resizable({ disabled: false }),
chainable = element.resizable( "disable" );

ok( !element.resizable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
ok( !element.resizable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.resizable( "widget" ).hasClass( "ui-resizable-disabled" ), "element gets ui-resizable-disabled" );
equal( element.resizable( "option", "disabled" ), true, "disabled option setter" );
equal( chainable, element, "disable is chainable" );
});
// this is here to make JSHint pass "unused", and we don't want to
// remove the parameter for when we finally implement
$.noop();

})(jQuery);
@@ -71,40 +71,34 @@ test("enable", function() {
equal(actual, expected, "enable is chainable");
});

test( "disable", function() {
expect( 6 );
var chainable,
test("disable", function() {
expect(3);
var expected, actual,
fired = false,
element = $( "#selectable1" );
el = $("#selectable1");

element.selectable({
el.selectable({
disabled: false,
start: function() {
fired = true;
}
start: function() { fired = true; }
});
element.simulate( "drag", {
el.simulate( "drag", {
dx: 20,
dy: 20
});
equal( fired, true, "start fired" );

chainable = element.selectable( "disable" );
equal(fired, true, "start fired");
el.selectable("disable");
fired = false;

element.simulate( "drag", {
el.simulate( "drag", {
dx: 20,
dy: 20
});
equal( fired, false, "start fired" );

ok( !element.selectable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
ok( !element.selectable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.selectable( "widget" ).hasClass( "ui-selectable-disabled" ), "element gets ui-selectable-disabled" );

element.selectable( "destroy" );
equal(fired, false, "start fired");
el.selectable("destroy");

equal( chainable, element, "disable is chainable" );
expected = $("<div></div>").selectable();
actual = expected.selectable("disable");
equal(actual, expected, "disable is chainable");
});

})(jQuery);
@@ -49,7 +49,7 @@ test( "enable", function() {
});

test( "disable", function() {
expect( 6 );
expect( 5 );
var element,
expected = $( "<div></div>" ).slider(),
actual = expected.slider( "disable" );
@@ -61,7 +61,6 @@ test( "disable", function() {
element.slider( "disable" );
ok( element.hasClass( "ui-state-disabled" ), "slider has ui-state-disabled class after disable method call" );
ok( element.hasClass( "ui-slider-disabled" ), "slider has ui-slider-disabled class after disable method call" );
ok( !element.attr( "aria-disabled" ), "slider does not have aria-disabled attr after disable method call" );
});

test( "value", function() {
@@ -64,30 +64,29 @@ test("enable", function() {
equal(actual, expected, "enable is chainable");
});

test( "disable", function() {
expect( 9 );
test("disable", function() {
expect(7);

var chainable,
element = $( "#sortable" ).sortable({ disabled: false });

TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
var el, actual, expected;

chainable = element.sortable( "disable" );
TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 0, "disabled.sortable getter" );
el = $("#sortable").sortable({ disabled: false });
TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, ".sortable({ disabled: false })");

element.sortable( "destroy" );
el.sortable("disable");
TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, "disabled.sortable getter");

element.sortable({ disabled: false });
TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" );
element.sortable( "option", "disabled", true);
equal( element.sortable( "option", "disabled" ), true, "disabled option setter" );
el.sortable("destroy");

ok( !element.sortable( "widget" ).hasClass( "ui-state-disabled" ), "element does not get ui-state-disabled" );
ok( !element.sortable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" );
ok( element.sortable( "widget" ).hasClass( "ui-sortable-disabled" ), "element gets ui-sortable-disabled" );
el.sortable({ disabled: false });
TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, ".sortable({ disabled: false })");
el.sortable("option", "disabled", true);
equal(el.sortable("option", "disabled"), true, "disabled option setter");
ok(el.sortable("widget").is(":not(.ui-state-disabled)"), "sortable element does not get ui-state-disabled since it's an interaction");
TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, ".sortable('option', 'disabled', true)");

TestHelpers.sortable.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" );
equal( chainable, element, "disable is chainable" );
expected = $("<div></div>").sortable(),
actual = expected.sortable("disable");
equal(actual, expected, "disable is chainable");
});

})(jQuery);
@@ -12,7 +12,7 @@ test( "destroy", function() {
});

test( "disable", function() {
expect( 16 );
expect( 14 );
var element = $( "#spin" ).val( 2 ).spinner(),
wrapper = $( "#spin" ).spinner( "widget" );

@@ -21,8 +21,6 @@ test( "disable", function() {

element.spinner( "disable" );
ok( wrapper.hasClass( "ui-spinner-disabled" ), "after: wrapper has ui-spinner-disabled class" );
ok( wrapper.hasClass( "ui-state-disabled" ), "after: wrapper has ui-state-disabled class" );
ok( !wrapper.attr( "aria-disabled" ), "after: wrapper does not have aria-disabled attr" );
ok( element.is( ":disabled"), "after: input has disabled attribute" );

simulateKeyDownUp( element, $.ui.keyCode.UP );
@@ -144,40 +144,24 @@ test( "{ collapsible: true }", function() {
});

test( "disabled", function() {
expect( 22 );
expect( 10 );

// fully enabled by default
var element = $( "#tabs1" ).tabs();
disabled( element, false );

ok( !element.tabs( "widget" ).hasClass( "ui-state-disabled" ), "after: wrapper doesn't have ui-state-disabled class" );
ok( !element.tabs( "widget" ).hasClass( "ui-tabs-disabled" ), "after: wrapper doesn't have ui-tabs-disabled class" );
ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );

// disable single tab
element.tabs( "option", "disabled", [ 1 ] );
disabled( element, [ 1 ] );

ok( !element.tabs( "widget" ).hasClass( "ui-state-disabled" ), "after: wrapper doesn't have ui-state-disabled class" );
ok( !element.tabs( "widget" ).hasClass( "ui-tabs-disabled" ), "after: wrapper doesn't have ui-tabs-disabled class" );
ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );

// disabled active tab
element.tabs( "option", "disabled", [ 0, 1 ] );
disabled( element, [ 0, 1 ] );

ok( !element.tabs( "widget" ).hasClass( "ui-state-disabled" ), "after: wrapper doesn't have ui-state-disabled class" );
ok( !element.tabs( "widget" ).hasClass( "ui-tabs-disabled" ), "after: wrapper doesn't have ui-tabs-disabled class" );
ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );

// disable all tabs
element.tabs( "option", "disabled", [ 0, 1, 2 ] );
disabled( element, true );

ok( !element.tabs( "widget" ).hasClass( "ui-state-disabled" ), "after: wrapper doesn't have ui-state-disabled class" );
ok( !element.tabs( "widget" ).hasClass( "ui-tabs-disabled" ), "after: wrapper doesn't have ui-tabs-disabled class" );
ok( !element.tabs( "widget" ).attr( "aria-disabled" ), "after: wrapper doesn't have aria-disabled attr" );

// enable all tabs
element.tabs( "option", "disabled", [] );
disabled( element, false );

0 comments on commit 23771d3

Please sign in to comment.
You can’t perform that action at this time.