aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2010-04-30 13:18:34 +0200
committerjzaefferer <joern.zaefferer@gmail.com>2010-04-30 13:18:34 +0200
commitadf19a18497a3baa3c7df1d8435998d79897182a (patch)
treec5cd00d79580c91fe183c5be5c528a54f9fae25b
parentabfdb2a8b6f93607c0791ba91ab616aed6b04772 (diff)
downloadjquery-ui-adf19a18497a3baa3c7df1d8435998d79897182a.tar.gz
jquery-ui-adf19a18497a3baa3c7df1d8435998d79897182a.zip
Renamed menu event selected to select to be consistent with naming conventions, already updated spec on wiki
-rw-r--r--tests/visual/menu/drilldown.html6
-rw-r--r--tests/visual/menu/menu.html2
-rw-r--r--tests/visual/menu/nested.html4
-rw-r--r--ui/jquery.ui.autocomplete.js2
-rw-r--r--ui/jquery.ui.menu.js2
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/visual/menu/drilldown.html b/tests/visual/menu/drilldown.html
index e9572db6c..7b24cd5e4 100644
--- a/tests/visual/menu/drilldown.html
+++ b/tests/visual/menu/drilldown.html
@@ -33,7 +33,7 @@
focus: function(event, ui) {
self.activeItem = ui.item;
},
- selected: function(event, ui) {
+ select: function(event, ui) {
if (this != self.active[0]) {
return;
}
@@ -42,7 +42,7 @@
self._open(nested);
} else {
self.element.find("h3").text(ui.item.text());
- self.options.selected.apply(this, arguments);
+ self.options.select.apply(this, arguments);
}
}
});
@@ -124,7 +124,7 @@
});
var drilldown = $("#drilldown").drilldown({
- selected: function(event, ui) {
+ select: function(event, ui) {
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
}
});
diff --git a/tests/visual/menu/menu.html b/tests/visual/menu/menu.html
index 0f3dadae0..2380e5a29 100644
--- a/tests/visual/menu/menu.html
+++ b/tests/visual/menu/menu.html
@@ -18,7 +18,7 @@
}).appendTo(document.body).themeswitcher();
$("#menu1, #menu2").menu({
- selected: function(event, ui) {
+ select: function(event, ui) {
$("<div/>").text("Selected: " + ui.item.text()).appendTo("#log");
}
});
diff --git a/tests/visual/menu/nested.html b/tests/visual/menu/nested.html
index 1d840f8c9..396b64a64 100644
--- a/tests/visual/menu/nested.html
+++ b/tests/visual/menu/nested.html
@@ -30,7 +30,7 @@
this.element.find("ul").andSelf().menu({
// disable built-in key handling
input: $(),
- selected: this.options.selected,
+ select: this.options.select,
focus: function(event, ui) {
self.active = ui.item.parent();
self.activeItem = ui.item;
@@ -77,7 +77,7 @@
});
var nestedmenu = $("#menu").nestedmenu({
- selected: function(event, ui) {
+ select: function(event, ui) {
$("#log").append("<div>Selected " + ui.item.text() + "</div>");
}
}).hide();
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index b4176c038..bd55c1ed4 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -115,7 +115,7 @@ $.widget( "ui.autocomplete", {
}
}
},
- selected: function( event, ui ) {
+ select: function( event, ui ) {
var item = ui.item.data( "item.autocomplete" );
if ( false !== self._trigger( "select", event, { item: item } ) ) {
self.element.val( item.value );
diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js
index b8e1fd410..895a6a806 100644
--- a/ui/jquery.ui.menu.js
+++ b/ui/jquery.ui.menu.js
@@ -208,7 +208,7 @@ $.widget("ui.menu", {
},
select: function( event ) {
- this._trigger("selected", event, { item: this.active });
+ this._trigger("select", event, { item: this.active });
}
});