From 2eb89f07341a557084fa3363fe22afe62530654d Mon Sep 17 00:00:00 2001 From: Scott González Date: Mon, 20 May 2013 11:30:49 -0400 Subject: Widget: Properly set widgetEventPrefix when redefining a widget. Fixes #9316 - Widget: widgetEventPrefix is empty when widget is (occasionally) loaded twice. --- tests/unit/widget/widget_core.js | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index 0d97742ff..3268b756d 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -331,6 +331,16 @@ test( "re-init", function() { deepEqual( actions, [ "optionfoo", "init" ], "correct methods called on re-init with options" ); }); +test( "redeclare", function() { + expect( 2 ); + + $.widget( "ui.testWidget", {} ); + equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" ); + + $.widget( "ui.testWidget", {} ); + equal( $.ui.testWidget.prototype.widgetEventPrefix, "testWidget" ); +}); + test( "inheritance", function() { expect( 6 ); // #5830 - Widget: Using inheritance overwrites the base classes options -- cgit v1.2.3 From 433ef9d433e9baa464cd0b313b82efa6f1d65556 Mon Sep 17 00:00:00 2001 From: David Hansen Date: Wed, 23 Jan 2013 11:46:10 -0700 Subject: Interactions: Fixed an off-by-one error in isOverAxis. --- tests/unit/droppable/droppable_methods.js | 31 ++++++++++++++++++++++++++++++- ui/jquery.ui.droppable.js | 2 +- ui/jquery.ui.sortable.js | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/droppable_methods.js index f7682d262..ce3d8f72f 100644 --- a/tests/unit/droppable/droppable_methods.js +++ b/tests/unit/droppable/droppable_methods.js @@ -88,4 +88,33 @@ test( "disable", function() { equal( actual, expected, "disable is chainable" ); }); -})(jQuery); +test( "intersect", function() { + expect( 8 ); + + var actual, data, + draggable = $( "
" ).appendTo( "#qunit-fixture" ).css({ width: 10, height: 10, position: "absolute" }).draggable(), + droppable = $( "
" ).appendTo( "#qunit-fixture" ).css({ width: 10, height: 10, position: "absolute", top: 5, left: 5 }).droppable(), + dataset = [ + [ -1, -1, false, "too far up and left" ], + [ -1, 0, false, "too far left" ], + [ 0, -1, false, "too far up" ], + [ 0, 0, true, "top left corner" ], + [ 9, 9, true, "bottom right corner" ], + [ 10, 9, false, "too far right" ], + [ 9, 10, false, "too far down" ], + [ 10, 10, false, "too far down and right" ] + ], + x = 0; + + for ( ; x < dataset.length; x++ ) { + data = dataset[ x ]; + $( draggable ).simulate( "drag", { + dx: ( data[ 0 ] - $( draggable ).position().left ), + dy: ( data[ 1 ] - $( draggable ).position().top ) + }); + actual = $.ui.intersect( $( draggable ).draggable( "instance" ), $( droppable ).droppable( "instance" ), "pointer" ); + equal( actual, data[ 2 ], data[ 3 ] ); + } +}); + +})( jQuery ); diff --git a/ui/jquery.ui.droppable.js b/ui/jquery.ui.droppable.js index 6bc4b594d..808009dc1 100644 --- a/ui/jquery.ui.droppable.js +++ b/ui/jquery.ui.droppable.js @@ -17,7 +17,7 @@ (function( $, undefined ) { function isOverAxis( x, reference, size ) { - return ( x > reference ) && ( x < ( reference + size ) ); + return ( x >= reference ) && ( x < ( reference + size ) ); } $.widget("ui.droppable", { diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js index c7794f06a..9c7bf446c 100644 --- a/ui/jquery.ui.sortable.js +++ b/ui/jquery.ui.sortable.js @@ -16,7 +16,7 @@ (function( $, undefined ) { function isOverAxis( x, reference, size ) { - return ( x > reference ) && ( x < ( reference + size ) ); + return ( x >= reference ) && ( x < ( reference + size ) ); } function isFloating(item) { -- cgit v1.2.3 From 24756a978a977d7abbef5e5bce403837a01d964f Mon Sep 17 00:00:00 2001 From: Brian Grinstead Date: Mon, 14 Jun 2010 08:20:03 -0700 Subject: Draggable: enabled draggable from within iframe. Fixed #5727 - draggable: cannot drag element inside iframe --- tests/jquery.simulate.js | 2 +- tests/unit/draggable/draggable_core.js | 16 ++++++++++++++++ ui/jquery.ui.core.js | 2 +- ui/jquery.ui.draggable.js | 16 ++++++++++------ ui/jquery.ui.mouse.js | 20 +++++++++++++------- 5 files changed, 41 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js index 0a0c42487..1dd96ac3a 100644 --- a/tests/jquery.simulate.js +++ b/tests/jquery.simulate.js @@ -313,7 +313,7 @@ $.extend( $.simulate.prototype, { clientY: Math.round( y ) }; - this.simulateEvent( document, "mousemove", coord ); + this.simulateEvent( target.ownerDocument, "mousemove", coord ); } if ( $.contains( document, target ) ) { diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index e7fcdfa87..e2dc2a481 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.js @@ -169,4 +169,20 @@ test( "#5009: scroll not working with parent's position fixed", function() { }); }); +test( "#5727: draggable from iframe" , function() { + expect( 2 ); + + var iframe = $( "" ).appendTo( "#qunit-fixture" ), + iframeBody = iframe.contents().find( "body" ).append( + "
Relative
" + ), + draggable1 = iframeBody.find( "#iframe-draggable-1" ); + + draggable1.draggable(); + + equal( draggable1.closest( iframeBody ).length, 1 ); + + TestHelpers.draggable.shouldMove( draggable1 ); +}); + })( jQuery ); diff --git a/ui/jquery.ui.core.js b/ui/jquery.ui.core.js index 898ce10d8..9145d5d45 100644 --- a/ui/jquery.ui.core.js +++ b/ui/jquery.ui.core.js @@ -69,7 +69,7 @@ $.fn.extend({ }).eq(0); } - return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent; + return ( /fixed/ ).test( this.css( "position") ) || !scrollParent.length ? $( this[ 0 ].ownerDocument || document ) : scrollParent; }, uniqueId: function() { diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js index 45b724fde..bf90d349b 100644 --- a/ui/jquery.ui.draggable.js +++ b/ui/jquery.ui.draggable.js @@ -325,7 +325,8 @@ $.widget("ui.draggable", $.ui.mouse, { _getParentOffset: function() { //Get the offsetParent and cache its position - var po = this.offsetParent.offset(); + var po = this.offsetParent.offset(), + document = this.document[ 0 ]; // This is a special case where we need to modify a offset calculated on start, since the following happened: // 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent @@ -383,7 +384,8 @@ $.widget("ui.draggable", $.ui.mouse, { _setContainment: function() { var over, c, ce, - o = this.options; + o = this.options, + document = this.document[ 0 ]; if ( !o.containment ) { this.containment = null; @@ -444,6 +446,7 @@ $.widget("ui.draggable", $.ui.mouse, { } var mod = d === "absolute" ? 1 : -1, + document = this.document[ 0 ], scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent; //Cache the scroll @@ -472,6 +475,7 @@ $.widget("ui.draggable", $.ui.mouse, { var containment, co, top, left, o = this.options, + document = this.document[ 0 ], scroll = this.cssPosition === "absolute" && !( this.scrollParent[ 0 ] !== document && $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? this.offsetParent : this.scrollParent, pageX = event.pageX, pageY = event.pageY; @@ -778,17 +782,17 @@ $.ui.plugin.add("draggable", "opacity", { $.ui.plugin.add("draggable", "scroll", { start: function( event, ui, i ) { - if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") { + if( i.scrollParent[ 0 ] !== i.document[ 0 ] && i.scrollParent[ 0 ].tagName !== "HTML" ) { i.overflowOffset = i.scrollParent.offset(); } }, drag: function( event, ui, i ) { var o = i.options, - scrolled = false; - - if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") { + scrolled = false, + document = i.document[ 0 ]; + if( i.scrollParent[ 0 ] !== document && i.scrollParent[ 0 ].tagName !== "HTML" ) { if(!o.axis || o.axis !== "x") { if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed; diff --git a/ui/jquery.ui.mouse.js b/ui/jquery.ui.mouse.js index df887d334..ca774e3da 100644 --- a/ui/jquery.ui.mouse.js +++ b/ui/jquery.ui.mouse.js @@ -48,7 +48,7 @@ $.widget("ui.mouse", { _mouseDestroy: function() { this.element.unbind("."+this.widgetName); if ( this._mouseMoveDelegate ) { - $(document) + this.document .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate) .unbind("mouseup."+this.widgetName, this._mouseUpDelegate); } @@ -99,9 +99,10 @@ $.widget("ui.mouse", { this._mouseUpDelegate = function(event) { return that._mouseUp(event); }; - $(document) - .bind("mousemove."+this.widgetName, this._mouseMoveDelegate) - .bind("mouseup."+this.widgetName, this._mouseUpDelegate); + + this.document + .bind( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .bind( "mouseup." + this.widgetName, this._mouseUpDelegate ); event.preventDefault(); @@ -114,6 +115,10 @@ $.widget("ui.mouse", { if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) { return this._mouseUp(event); } + // Iframe mouseup check - mouseup occurred in another document + else if ( !event.which ) { + return this._mouseUp( event ); + } if (this._mouseStarted) { this._mouseDrag(event); @@ -130,9 +135,9 @@ $.widget("ui.mouse", { }, _mouseUp: function(event) { - $(document) - .unbind("mousemove."+this.widgetName, this._mouseMoveDelegate) - .unbind("mouseup."+this.widgetName, this._mouseUpDelegate); + this.document + .unbind( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .unbind( "mouseup." + this.widgetName, this._mouseUpDelegate ); if (this._mouseStarted) { this._mouseStarted = false; @@ -144,6 +149,7 @@ $.widget("ui.mouse", { this._mouseStop(event); } + mouseHandled = false; return false; }, -- cgit v1.2.3