From 130001c377e7abf17ea2f4f856cab30882a60f92 Mon Sep 17 00:00:00 2001
From: Thomas Fuchs <thomas@fesch.at>
Date: Thu, 9 Mar 2006 09:59:29 +0000
Subject: Update to latest script.aculo.us trunk, fixes possible issue with
 Effect.Appear on IE

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3824 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/lib/action_view/helpers/javascripts/effects.js | 9 ++++++---
 railties/html/javascripts/dragdrop.js                     | 3 ++-
 railties/html/javascripts/effects.js                      | 9 ++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/actionpack/lib/action_view/helpers/javascripts/effects.js b/actionpack/lib/action_view/helpers/javascripts/effects.js
index 3abb0eed04..c1befe5397 100644
--- a/actionpack/lib/action_view/helpers/javascripts/effects.js
+++ b/actionpack/lib/action_view/helpers/javascripts/effects.js
@@ -86,9 +86,12 @@ Element.childrenWithClassName = function(element, className) {
 }
 
 Element.forceRerendering = function(element) {
-  var n = document.createTextNode(' ');
-  $(element).appendChild(n);
-  Element.remove(n);
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) {}
 }
 
 Array.prototype.call = function() {
diff --git a/railties/html/javascripts/dragdrop.js b/railties/html/javascripts/dragdrop.js
index b44afe4881..2b68ee30e4 100644
--- a/railties/html/javascripts/dragdrop.js
+++ b/railties/html/javascripts/dragdrop.js
@@ -558,9 +558,10 @@ var Sortable = {
   findElements: function(element, options) {
     if(!element.hasChildNodes()) return null;
     var elements = [];
+    var only = options.only ? [options.only].flatten() : null;
     $A(element.childNodes).each( function(e) {
       if(e.tagName && e.tagName.toUpperCase()==options.tag.toUpperCase() &&
-        (!options.only || (Element.hasClassName(e, options.only))))
+        (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
           elements.push(e);
       if(options.tree) {
         var grandchildren = this.findElements(e, options);
diff --git a/railties/html/javascripts/effects.js b/railties/html/javascripts/effects.js
index 3abb0eed04..c1befe5397 100644
--- a/railties/html/javascripts/effects.js
+++ b/railties/html/javascripts/effects.js
@@ -86,9 +86,12 @@ Element.childrenWithClassName = function(element, className) {
 }
 
 Element.forceRerendering = function(element) {
-  var n = document.createTextNode(' ');
-  $(element).appendChild(n);
-  Element.remove(n);
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) {}
 }
 
 Array.prototype.call = function() {
-- 
cgit v1.2.3