aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/javascripts/dragdrop.js
diff options
context:
space:
mode:
authorThomas Fuchs <thomas@fesch.at>2005-10-29 11:48:53 +0000
committerThomas Fuchs <thomas@fesch.at>2005-10-29 11:48:53 +0000
commitd8f0a3f93ca80fa64435dde8100d0eae6110207c (patch)
tree1f4aeef81cbb4f91efab33d87c628af4cf467858 /actionpack/lib/action_view/helpers/javascripts/dragdrop.js
parent0a6d6082539f68733f44117ee0c7828c89dd3cfb (diff)
downloadrails-d8f0a3f93ca80fa64435dde8100d0eae6110207c.tar.gz
rails-d8f0a3f93ca80fa64435dde8100d0eae6110207c.tar.bz2
rails-d8f0a3f93ca80fa64435dde8100d0eae6110207c.zip
Update script.aculo.us to V1.5_rc4
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2802 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/javascripts/dragdrop.js')
-rw-r--r--actionpack/lib/action_view/helpers/javascripts/dragdrop.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/javascripts/dragdrop.js b/actionpack/lib/action_view/helpers/javascripts/dragdrop.js
index 5445d748c3..63a68243b6 100644
--- a/actionpack/lib/action_view/helpers/javascripts/dragdrop.js
+++ b/actionpack/lib/action_view/helpers/javascripts/dragdrop.js
@@ -280,7 +280,7 @@ Draggable.prototype = {
style.position = "relative";
if(this.options.zindex) {
- this.options.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+ this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
style.zIndex = this.options.zindex;
}
@@ -355,8 +355,8 @@ var Sortable = {
hoverclass: null,
ghosting: false,
format: null,
- onChange: function() {},
- onUpdate: function() {}
+ onChange: Prototype.emptyFunction,
+ onUpdate: Prototype.emptyFunction
}, arguments[1] || {});
// clear any old sortable with same element
@@ -472,7 +472,10 @@ var Sortable = {
onEmptyHover: function(element, dropon) {
if(element.parentNode!=dropon) {
+ var oldParentNode = element.parentNode;
dropon.appendChild(element);
+ Sortable.options(oldParentNode).onChange(element);
+ Sortable.options(dropon).onChange(element);
}
},