diff options
| author | Felix Nagel <info@felixnagel.com> | 2015-12-02 18:20:54 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2015-12-02 18:30:05 +0100 |
| commit | c10ef0a170218ae64abaee54518b09068eadb51e (patch) | |
| tree | 8ff6c9cb8e0f4a8846a3b272a26e65fef946ae3c /ui/widgets/draggable.js | |
| parent | 7ed45541096b58c56c4fc40b1a0ca9c10b2fe229 (diff) | |
| parent | 6c738d961d9918f75a3043a49ab21ac79bca45ae (diff) | |
| download | jquery-ui-c10ef0a170218ae64abaee54518b09068eadb51e.tar.gz jquery-ui-c10ef0a170218ae64abaee54518b09068eadb51e.zip | |
Merge branch 'master' into datepicker
Diffstat (limited to 'ui/widgets/draggable.js')
| -rw-r--r-- | ui/widgets/draggable.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/widgets/draggable.js b/ui/widgets/draggable.js index f61c38ce0..7da09b7ec 100644 --- a/ui/widgets/draggable.js +++ b/ui/widgets/draggable.js @@ -12,7 +12,7 @@ //>>description: Enables dragging functionality for any element. //>>docs: http://api.jqueryui.com/draggable/ //>>demos: http://jqueryui.com/draggable/ -//>>css.structure: ../themes/base/draggable.css +//>>css.structure: ../../themes/base/draggable.css ( function( factory ) { if ( typeof define === "function" && define.amd ) { @@ -255,7 +255,7 @@ $.widget( "ui.draggable", $.ui.mouse, { if ( !noPropagation ) { var ui = this._uiHash(); if ( this._trigger( "drag", event, ui ) === false ) { - this._mouseUp( {} ); + this._mouseUp( new $.Event( "mouseup", event ) ); return false; } this.position = ui.position; @@ -322,7 +322,7 @@ $.widget( "ui.draggable", $.ui.mouse, { cancel: function() { if ( this.helper.is( ".ui-draggable-dragging" ) ) { - this._mouseUp( {} ); + this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) ); } else { this._clear(); } |