aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjzaefferer <joern.zaefferer@gmail.com>2011-02-24 10:06:08 +0100
committerjzaefferer <joern.zaefferer@gmail.com>2011-02-24 10:06:08 +0100
commit0d659d44c3a95ff380ec88c7338ef270bf04683c (patch)
tree9726b5b4a46b6da46bdd66d2036916d754c0bb75 /tests
parentd7682daaa8625c2134386c501e9e5ffaab004984 (diff)
downloadjquery-ui-0d659d44c3a95ff380ec88c7338ef270bf04683c.tar.gz
jquery-ui-0d659d44c3a95ff380ec88c7338ef270bf04683c.zip
Menu: Rename activate to focus and deactivate to blur method
Diffstat (limited to 'tests')
-rw-r--r--tests/visual/menu/contextmenu.html4
-rw-r--r--tests/visual/menu/drilldown.html4
-rw-r--r--tests/visual/menu/flyoutmenu.js4
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/visual/menu/contextmenu.html b/tests/visual/menu/contextmenu.html
index 68fdd5234..03e21fdc3 100644
--- a/tests/visual/menu/contextmenu.html
+++ b/tests/visual/menu/contextmenu.html
@@ -30,7 +30,7 @@
}).click(function(event) {
// TODO required to prevent the click handler below from handling this event
event.stopPropagation();
- var menu = $("#menu" + this.id).menu("deactivate").show().position({
+ var menu = $("#menu" + this.id).menu("blur").show().position({
my: "left top",
at: "right top",
of: event.pageX > 0 ? event : this
@@ -72,7 +72,7 @@
});
}
if (match.length) {
- menu.activate(event, match);
+ menu.focus(event, match);
if (match.length > 1) {
menu.previousFilter = character;
menu.filterTimer = setTimeout(function() {
diff --git a/tests/visual/menu/drilldown.html b/tests/visual/menu/drilldown.html
index 65cdf1111..572c1765b 100644
--- a/tests/visual/menu/drilldown.html
+++ b/tests/visual/menu/drilldown.html
@@ -108,7 +108,7 @@
var nested = this.activeItem.find(">ul");
if (nested.length) {
this._open(nested);
- nested.menu("activate", event, nested.children(":first"))
+ nested.menu("focus", event, nested.children(":first"))
}
},
@@ -185,7 +185,7 @@
});
}
if (match.length) {
- menu.activate(event, match);
+ menu.focus(event, match);
if (match.length > 1) {
menu.previousFilter = character;
menu.filterTimer = setTimeout(function() {
diff --git a/tests/visual/menu/flyoutmenu.js b/tests/visual/menu/flyoutmenu.js
index bffecea7f..2599d105b 100644
--- a/tests/visual/menu/flyoutmenu.js
+++ b/tests/visual/menu/flyoutmenu.js
@@ -135,7 +135,7 @@ $.widget("ui.flyoutmenu", {
activate: function(event, item) {
if (item) {
item.parent().data("menu").widget().show();
- item.parent().data("menu").activate(event, item);
+ item.parent().data("menu").focus(event, item);
}
this.activeItem = item;
this.active = item.parent("ul")
@@ -147,7 +147,7 @@ $.widget("ui.flyoutmenu", {
},
hide: function() {
this.activeItem = this.element.children("li").first();
- this.element.find("ul").andSelf().menu("deactivate").hide();
+ this.element.find("ul").andSelf().menu("blur").hide();
}
});