#174708 by multiple contributors: update jQuery to 1.2

1 files changed, 8 insertions, 4 deletions

diff --git a/misc/ahah.js b/misc/ahah.js
index 7f48bb91d..87ab19404 100644
--- a/misc/ahah.js
+++ b/misc/ahah.js
@@ -69,7 +69,9 @@ Drupal.ahah.prototype.onsubmit = function () {
     margin: '0 0 0 20px'
   });
   button.css('float', 'left').attr('disabled', true).after(progress_element);
-  eval('progress_element.' + this.showEffect + '()');
+  if (progress_element[this.showEffect]) {
+    progress_element[this.showEffect]();
+  }
 };
 
 /**
@@ -93,10 +95,12 @@ Drupal.ahah.prototype.oncomplete = function (data) {
   if (this.method == 'replace') {
     wrapper.empty().append(new_content);
   }
-  else {
-    eval('wrapper.' + this.method + '(new_content)');
+  else if (wrapper[this.method]) {
+    wrapper[this.method](new_content);
+  }
+  if (new_content[this.showEffect]) {
+    new_content[this.showEffect]();
   }
-  eval('new_content.' + this.showEffect + '()');
   button.css('float', 'none').attr('disabled', false);
 
   Drupal.attachBehaviors(new_content);