Selectmenu: Default disabled option to null

diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js
index 93b526bd82bb4ed4b8ae39de7cac06e4ba2cfe41..10073fe97beb418f08fa6d9a41157f9cf87e9c10 100644 (file)
--- 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 7fc2119cb16f192fc33091db3c23d3af07f35b5d..2107285fe36a8bb48331ec6f72d7ee4a1b6aaef7 100644 (file)
--- 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"
                },