Permalink
Browse files

Sortable: fire "over" and "out" even when a connectWith hasn't changed

Fixes #9335
  • Loading branch information...
NiGhTTraX authored and mikesherov committed Jan 14, 2014
1 parent 4dad6bb commit 1cfebf803beedef05e8dcdd54e34d10c412a9a2b
Showing with 109 additions and 1 deletion.
  1. +2 −1 tests/unit/sortable/sortable.html
  2. +103 −0 tests/unit/sortable/sortable_events.js
  3. +4 −0 ui/sortable.js
@@ -16,7 +16,8 @@
"ui/core.js",
"ui/widget.js",
"ui/mouse.js",
"ui/sortable.js"
"ui/sortable.js",
"ui/draggable.js"
]
});
</script>
@@ -258,11 +258,114 @@ test( "over", function() {
equal( overCount, 1, "over fires only once" );
});
// http://bugs.jqueryui.com/ticket/9335
// Sortable: over & out events does not consistently fire
test( "over, fires with draggable connected to sortable", function() {
expect( 3 );
var hash,
overCount = 0,
item = $( "<div></div>" ).text( "6" ).insertAfter( "#sortable" );
item.draggable({
connectToSortable: "#sortable"
});
$( ".connectWith" ).sortable({
connectWith: ".connectWith",
over: function( event, ui ) {
hash = ui;
overCount++;
}
});
item.simulate( "drag", {
dy: -20
});
ok( hash, "over event triggered" );
ok( !hash.sender, "UI should not include: sender" );
equal( overCount, 1, "over fires only once" );
});
test( "over, with connected sortable", function() {
expect( 3 );
var hash,
overCount = 0;
$( ".connectWith" ).sortable({
connectWith: ".connectWith"
});
$( "#sortable2" ).on( "sortover", function( event, ui ) {
hash = ui;
overCount++;
});
$( "#sortable" ).find( "li:eq(0)" ).simulate( "drag", {
dy: 102
});
ok( hash, "over event triggered" );
equal( hash.sender[ 0 ], $(" #sortable" )[ 0 ], "UI includes: sender" );
equal( overCount, 1, "over fires only once" );
});
/*
test("out", function() {
ok(false, "missing test - untested code is broken code.");
});
*/
test( "out, with connected sortable", function() {
expect( 2 );
var hash,
outCount = 0;
$( ".connectWith" ).sortable({
connectWith: ".connectWith"
});
$( "#sortable" ).on( "sortout", function( event, ui ) {
hash = ui;
outCount++;
});
$( "#sortable" ).find( "li:last" ).simulate( "drag", {
dy: 40
});
ok( hash, "out event triggered" );
equal( outCount, 1, "out fires only once" );
});
test( "repeated out & over between connected sortables", function() {
expect( 2 );
var outCount = 0,
overCount = 0;
$( ".connectWith" ).sortable({
connectWith: ".connectWith",
over: function() {
overCount++;
},
out: function( event, ui ) {
// Ignore events that trigger when an item has dropped
// checking for the presence of the helper.
if ( !ui.helper ) {
outCount++;
}
}
});
$( "#sortable" ).find( "li:last" ).simulate( "drag", {
dy: 40
}).simulate( "drag", {
dy: -40
});
equal( outCount, 2, "out fires twice" );
equal( overCount, 4, "over fires four times" );
});
/*
test("activate", function() {
ok(false, "missing test - untested code is broken code.");
});
View
@@ -911,6 +911,10 @@ return $.widget("ui.sortable", $.ui.mouse, {
}
if(this.currentContainer === this.containers[innermostIndex]) {
if ( !this.currentContainer.containerCache.over ) {
this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
this.currentContainer.containerCache.over = 1;
}
return;
}

0 comments on commit 1cfebf8

Please sign in to comment.