aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2013-03-07 23:56:48 +0100
committerFelix Nagel <info@felixnagel.com>2013-03-07 23:56:48 +0100
commit0bf91a41c6ea0025cdb25b55ada0dde7b8fdc0ff (patch)
treeafdfd77c7bdc18baae90aed731c6c59c2af4e184 /ui
parent6acc6bdd7f2fcf56d02699683de6fbec62316294 (diff)
parent5b2da7c127aa1afd9852063b6e4701ec6607e941 (diff)
downloadjquery-ui-0bf91a41c6ea0025cdb25b55ada0dde7b8fdc0ff.tar.gz
jquery-ui-0bf91a41c6ea0025cdb25b55ada0dde7b8fdc0ff.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.draggable.js14
-rw-r--r--ui/jquery.ui.sortable.js2
2 files changed, 8 insertions, 8 deletions
diff --git a/ui/jquery.ui.draggable.js b/ui/jquery.ui.draggable.js
index 27b6b4ef0..7c1fb3361 100644
--- a/ui/jquery.ui.draggable.js
+++ b/ui/jquery.ui.draggable.js
@@ -283,14 +283,12 @@ $.widget("ui.draggable", $.ui.mouse, {
_getHandle: function(event) {
var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
- $(this.options.handle, this.element)
- .find("*")
- .addBack()
- .each(function() {
- if(this === event.target) {
- handle = true;
- }
- });
+
+ this.element.find( this.options.handle ).each(function() {
+ if(this === event.target) {
+ handle = true;
+ }
+ });
return handle;
diff --git a/ui/jquery.ui.sortable.js b/ui/jquery.ui.sortable.js
index f095ce9c5..93c6cccc5 100644
--- a/ui/jquery.ui.sortable.js
+++ b/ui/jquery.ui.sortable.js
@@ -762,6 +762,8 @@ $.widget("ui.sortable", $.ui.mouse, {
// width of the table (browsers are smart enough to
// handle this properly)
element.append( "<td colspan='99'>&#160;</td>" );
+ } else if ( nodeName === "img" ) {
+ element.attr( "src", that.currentItem.attr( "src" ) );
}
if ( !className ) {