aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2014-04-21 10:32:49 -0400
committerScott González <scott.gonzalez@gmail.com>2014-04-21 10:32:49 -0400
commitfd7e1e3040ec2c6edb4754135602b5c31678e659 (patch)
treedcf29dedb527fb8015b963789cdd078dcfcf4f64
parent8b2606a650266653ef086ae5ef03110cd18ae2b1 (diff)
downloadjquery-ui-fd7e1e3040ec2c6edb4754135602b5c31678e659.tar.gz
jquery-ui-fd7e1e3040ec2c6edb4754135602b5c31678e659.zip
Selectmenu: Default disabled option to null
-rw-r--r--tests/unit/selectmenu/selectmenu_common.js4
-rw-r--r--ui/selectmenu.js1
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js
index 93b526bd8..10073fe97 100644
--- a/tests/unit/selectmenu/selectmenu_common.js
+++ b/tests/unit/selectmenu/selectmenu_common.js
@@ -1,7 +1,7 @@
TestHelpers.commonWidgetTests( "selectmenu", {
defaults: {
appendTo: null,
- disabled: false,
+ disabled: null,
icons: {
button: "ui-icon-triangle-1-s"
},
@@ -13,9 +13,9 @@ TestHelpers.commonWidgetTests( "selectmenu", {
width: null,
// callbacks
- create: null,
change: null,
close: null,
+ create: null,
focus: null,
open: null,
select: null
diff --git a/ui/selectmenu.js b/ui/selectmenu.js
index 7fc2119cb..2107285fe 100644
--- a/ui/selectmenu.js
+++ b/ui/selectmenu.js
@@ -31,6 +31,7 @@ return $.widget( "ui.selectmenu", {
defaultElement: "<select>",
options: {
appendTo: null,
+ disabled: null,
icons: {
button: "ui-icon-triangle-1-s"
},