aboutsummaryrefslogtreecommitdiffstats
path: root/railties/html/javascripts/dragdrop.js
diff options
context:
space:
mode:
authorThomas Fuchs <thomas@fesch.at>2007-01-19 20:56:31 +0000
committerThomas Fuchs <thomas@fesch.at>2007-01-19 20:56:31 +0000
commit0f8ed48bf5c8882f413e914fc64ce0d1c60cbbcb (patch)
treee8389f228fac9140d06403230eba9ed6f56e3532 /railties/html/javascripts/dragdrop.js
parent94e36ef363eab3a1c6dcbf6d847ab26c9259d9e5 (diff)
downloadrails-0f8ed48bf5c8882f413e914fc64ce0d1c60cbbcb.tar.gz
rails-0f8ed48bf5c8882f413e914fc64ce0d1c60cbbcb.tar.bz2
rails-0f8ed48bf5c8882f413e914fc64ce0d1c60cbbcb.zip
Update trunk to script.aculo.us 1.7.0
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6004 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/html/javascripts/dragdrop.js')
-rw-r--r--railties/html/javascripts/dragdrop.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/railties/html/javascripts/dragdrop.js b/railties/html/javascripts/dragdrop.js
index c71ddb8274..7ee9a5f317 100644
--- a/railties/html/javascripts/dragdrop.js
+++ b/railties/html/javascripts/dragdrop.js
@@ -303,12 +303,12 @@ Draggable.prototype = {
if(Event.isLeftClick(event)) {
// abort on form elements, fixes a Firefox issue
var src = Event.element(event);
- if(src.tagName && (
- src.tagName=='INPUT' ||
- src.tagName=='SELECT' ||
- src.tagName=='OPTION' ||
- src.tagName=='BUTTON' ||
- src.tagName=='TEXTAREA')) return;
+ if((tag_name = src.tagName.toUpperCase()) && (
+ tag_name=='INPUT' ||
+ tag_name=='SELECT' ||
+ tag_name=='OPTION' ||
+ tag_name=='BUTTON' ||
+ tag_name=='TEXTAREA')) return;
var pointer = [Event.pointerX(event), Event.pointerY(event)];
var pos = Position.cumulativeOffset(this.element);
@@ -572,7 +572,7 @@ var Sortable = {
sortables: {},
_findRootElement: function(element) {
- while (element.tagName != "BODY") {
+ while (element.tagName.toUpperCase() != "BODY") {
if(element.id && Sortable.sortables[element.id]) return element;
element = element.parentNode;
}