Index: js/ajax-responder.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/js/ajax-responder.js,v
retrieving revision 1.18.2.8
diff -u -p -r1.18.2.8 ajax-responder.js
--- js/ajax-responder.js	22 Feb 2010 19:50:39 -0000	1.18.2.8
+++ js/ajax-responder.js	6 Mar 2010 15:30:05 -0000
@@ -49,7 +49,7 @@
     var $objects = $('a[href=' + old_url + ']')
     $objects.addClass('ctools-fetching');
     try {
-      url = old_url.replace(/nojs/g, 'ajax');
+      url = old_url.replace(/\/nojs(\/|$)/g, '/ajax$1');
       $.ajax({
         type: "POST",
         url: url,
@@ -108,7 +108,7 @@
     var object = $(this);
     $(this).addClass('ctools-ajaxing');
     try {
-      url = url.replace(/nojs/g, 'ajax');
+      url = url.replace(/\/nojs(\/|$)/g, '/ajax$1');
       $.ajax({
         type: "POST",
         url: url,
@@ -150,7 +150,7 @@
     var object = $(this);
     try {
       if (url) {
-        url = url.replace('/nojs/', '/ajax/');
+        url = url.replace(/\/nojs(\/|$)/g, '/ajax$1');
         $.ajax({
           type: "POST",
           url: url,
@@ -169,7 +169,7 @@
       else {
         var form = this.form;
         url = $(form).attr('action');
-        url = url.replace('/nojs/', '/ajax/');
+        url = url.replace(/\/nojs(\/|$)/g, '/ajax$1');
         $(form).ajaxSubmit({
           type: "POST",
           url: url,
@@ -238,7 +238,7 @@
     var form_id = $(object).parents('form').get(0).id;
     try {
       if (url) {
-        url = url.replace('/nojs/', '/ajax/');
+        url = url.replace(/\/nojs(\/|$)/g, '/ajax$1');
         $.ajax({
           type: "POST",
           url: url,
Index: js/modal.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/js/modal.js,v
retrieving revision 1.17.2.7
diff -u -p -r1.17.2.7 modal.js
--- js/modal.js	22 Feb 2010 19:50:39 -0000	1.17.2.7
+++ js/modal.js	6 Mar 2010 15:30:06 -0000
@@ -146,7 +146,7 @@
     $(this).addClass('ctools-ajaxing');
     var object = $(this);
     try {
-      url.replace('/nojs/', '/ajax/');
+      url.replace(/\/nojs(\/|$)/g, '/ajax$1');
 
       var ajaxOptions = {
         type: 'POST',