aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/effect/addClass.html2
-rw-r--r--demos/effect/animate.html2
-rw-r--r--demos/effect/default.html2
-rw-r--r--demos/effect/easing.html2
-rw-r--r--demos/effect/hide.html2
-rw-r--r--demos/effect/removeClass.html2
-rw-r--r--demos/effect/show.html2
-rw-r--r--demos/effect/switchClass.html2
-rw-r--r--demos/effect/toggle.html2
-rw-r--r--demos/effect/toggleClass.html2
-rw-r--r--tests/visual/effects/clip.html6
-rw-r--r--tests/visual/effects/effects.js16
-rw-r--r--tests/visual/effects/scale.html8
-rw-r--r--tests/visual/effects/shake.html2
-rw-r--r--ui/effect.js4
15 files changed, 28 insertions, 28 deletions
diff --git a/demos/effect/addClass.html b/demos/effect/addClass.html
index 0aab17304..915a72f2d 100644
--- a/demos/effect/addClass.html
+++ b/demos/effect/addClass.html
@@ -15,7 +15,7 @@
</style>
<script>
$(function() {
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
$( "#effect" ).addClass( "newClass", 1000, callback );
});
diff --git a/demos/effect/animate.html b/demos/effect/animate.html
index 7de535114..853b72326 100644
--- a/demos/effect/animate.html
+++ b/demos/effect/animate.html
@@ -16,7 +16,7 @@
<script>
$(function() {
var state = true;
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
if ( state ) {
$( "#effect" ).animate({
backgroundColor: "#aa0000",
diff --git a/demos/effect/default.html b/demos/effect/default.html
index f2a6b7686..624318f22 100644
--- a/demos/effect/default.html
+++ b/demos/effect/default.html
@@ -59,7 +59,7 @@
};
// set effect from select menu value
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
runEffect();
return false;
});
diff --git a/demos/effect/easing.html b/demos/effect/easing.html
index c70786d73..26d0a96b5 100644
--- a/demos/effect/easing.html
+++ b/demos/effect/easing.html
@@ -79,7 +79,7 @@
ctx.stroke();
// animate on click
- graph.click(function() {
+ graph.on( "click", function() {
wrap
.animate( { height: "hide" }, 2000, name )
.delay( 800 )
diff --git a/demos/effect/hide.html b/demos/effect/hide.html
index 301f93047..b19ec0209 100644
--- a/demos/effect/hide.html
+++ b/demos/effect/hide.html
@@ -55,7 +55,7 @@
};
// set effect from select menu value
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
runEffect();
});
});
diff --git a/demos/effect/removeClass.html b/demos/effect/removeClass.html
index ae2fa562e..f4a902185 100644
--- a/demos/effect/removeClass.html
+++ b/demos/effect/removeClass.html
@@ -15,7 +15,7 @@
</style>
<script>
$(function() {
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
$( "#effect" ).removeClass( "newClass", 1000, callback );
});
diff --git a/demos/effect/show.html b/demos/effect/show.html
index 5583ff36f..f95c513ae 100644
--- a/demos/effect/show.html
+++ b/demos/effect/show.html
@@ -55,7 +55,7 @@
};
// set effect from select menu value
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
runEffect();
});
diff --git a/demos/effect/switchClass.html b/demos/effect/switchClass.html
index 0ac90fe93..f7c6d12da 100644
--- a/demos/effect/switchClass.html
+++ b/demos/effect/switchClass.html
@@ -16,7 +16,7 @@
</style>
<script>
$(function() {
- $( "#button" ).click(function(){
+ $( "#button" ).on( "click", function(){
$( ".newClass" ).switchClass( "newClass", "anotherNewClass", 1000 );
$( ".anotherNewClass" ).switchClass( "anotherNewClass", "newClass", 1000 );
});
diff --git a/demos/effect/toggle.html b/demos/effect/toggle.html
index bac5758ab..e646ec994 100644
--- a/demos/effect/toggle.html
+++ b/demos/effect/toggle.html
@@ -63,7 +63,7 @@
};
// set effect from select menu value
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
runEffect();
});
});
diff --git a/demos/effect/toggleClass.html b/demos/effect/toggleClass.html
index f8bf31fe7..20161a81a 100644
--- a/demos/effect/toggleClass.html
+++ b/demos/effect/toggleClass.html
@@ -15,7 +15,7 @@
</style>
<script>
$(function() {
- $( "#button" ).click(function() {
+ $( "#button" ).on( "click", function() {
$( "#effect" ).toggleClass( "newClass", 1000 );
});
});
diff --git a/tests/visual/effects/clip.html b/tests/visual/effects/clip.html
index f56f54189..b8ede414b 100644
--- a/tests/visual/effects/clip.html
+++ b/tests/visual/effects/clip.html
@@ -12,14 +12,14 @@
var target = $( ".target" ),
duration = 2000;
- $( ".toggle" ).click(function( event ) {
+ $( ".toggle" ).on( "click", function( event ) {
event.preventDefault();
target.toggle( "clip", {
direction: "horizontal"
}, duration );
});
- $( ".effect-toggle" ).click(function( event ) {
+ $( ".effect-toggle" ).on( "click", function( event ) {
event.preventDefault();
target.effect( "clip", {
direction: "vertical",
@@ -27,7 +27,7 @@
}, duration );
});
- $( ".effect-default" ).click(function( event ) {
+ $( ".effect-default" ).on( "click", function( event ) {
event.preventDefault();
target.effect( "clip", {
direction: "vertical"
diff --git a/tests/visual/effects/effects.js b/tests/visual/effects/effects.js
index f0963a99d..114dcc2a6 100644
--- a/tests/visual/effects/effects.js
+++ b/tests/visual/effects/effects.js
@@ -8,7 +8,7 @@ function effect( elem, name, options ) {
easing: "easeOutQuint"
});
- $( elem ).click(function() {
+ $( elem ).on( "click", function() {
$( this )
.addClass( "current" )
// delaying the initial animation makes sure that the queue stays in tact
@@ -21,7 +21,7 @@ function effect( elem, name, options ) {
});
}
-$( "#hide" ).click(function() {
+$( "#hide" ).on( "click", function() {
$( this )
.addClass( "current" )
.hide( duration )
@@ -60,7 +60,7 @@ effect( "#pulsate", "pulsate", { times: 2 } );
effect( "#puff", "puff", {} );
effect( "#scale", "scale", {} );
effect( "#size", "size", {} );
-$( "#sizeToggle" ).click(function() {
+$( "#sizeToggle" ).on( "click", function() {
var options = { to: { width: 300, height: 300 } };
$( this )
.addClass( "current" )
@@ -71,7 +71,7 @@ $( "#sizeToggle" ).click(function() {
});
});
-$( "#shake" ).click(function() {
+$( "#shake" ).on( "click", function() {
$( this )
.addClass( "current" )
.effect( "shake", {}, 100, function() {
@@ -84,7 +84,7 @@ effect( "#slideUp", "slide", { direction: "up" } );
effect( "#slideLeft", "slide", { direction: "left" } );
effect( "#slideRight", "slide", { direction: "right" } );
-$( "#transfer" ).click(function() {
+$( "#transfer" ).on( "click", function() {
$( this )
.addClass( "current" )
.effect( "transfer", { to: "div:eq(0)" }, 1000, function() {
@@ -92,15 +92,15 @@ $( "#transfer" ).click(function() {
});
});
-$( "#addClass" ).click(function() {
+$( "#addClass" ).on( "click", function() {
$( this ).addClass( "current", duration, function() {
$( this ).removeClass( "current" );
});
});
-$( "#removeClass" ).click(function() {
+$( "#removeClass" ).on( "click", function() {
$( this ).addClass( "current" ).removeClass( "current", duration );
});
-$( "#toggleClass" ).click(function() {
+$( "#toggleClass" ).on( "click", function() {
$( this ).toggleClass( "current", duration );
});
diff --git a/tests/visual/effects/scale.html b/tests/visual/effects/scale.html
index 648a7027b..0723d9458 100644
--- a/tests/visual/effects/scale.html
+++ b/tests/visual/effects/scale.html
@@ -21,12 +21,12 @@
total *= this.options.length;
});
- opts.change( doAnim );
- doer.click( doAnim );
- $( "#cyclePrev" ).click(function() {
+ opts.on( "change", doAnim );
+ doer.on( "click", doAnim );
+ $( "#cyclePrev" ).on( "click", function() {
cycle( -1 );
});
- $( "#cycleNext" ).click(function() {
+ $( "#cycleNext" ).on( "click", function() {
cycle( 1 );
});
diff --git a/tests/visual/effects/shake.html b/tests/visual/effects/shake.html
index 595412b2b..29159e39d 100644
--- a/tests/visual/effects/shake.html
+++ b/tests/visual/effects/shake.html
@@ -10,7 +10,7 @@
<script src="../../../ui/effect-shake.js"></script>
<script>
$(function() {
- $( "#btn" ).click(function() {
+ $( "#btn" ).on( "click", function() {
$( ".shake" ).effect( "shake", {
duration: +$( "#duration" ).val(),
mode: "toggle"
diff --git a/ui/effect.js b/ui/effect.js
index a946c6e8b..86afea226 100644
--- a/ui/effect.js
+++ b/ui/effect.js
@@ -991,7 +991,7 @@ if ( $.uiBackCompat !== false ) {
// Fixes #7595 - Elements lose focus when wrapped.
if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
- $( active ).focus();
+ $( active ).trigger( "focus" );
}
wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
@@ -1032,7 +1032,7 @@ if ( $.uiBackCompat !== false ) {
// Fixes #7595 - Elements lose focus when wrapped.
if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
- $( active ).focus();
+ $( active ).trigger( "focus" );
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:09:35 +0000