[Jifty-commit] r3413 - in jifty/trunk: share/web/static/js share/web/templates/__jifty/webservices

[jifty-commit at lists.jifty.org]

Author: jesse
Date: Fri Jun  8 19:16:51 2007
New Revision: 3413

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/static/js/jifty.js
   jifty/trunk/share/web/templates/__jifty/webservices/xml

Log:
 r58188 at pinglin:  jesse | 2007-06-08 19:16:30 -0400
 * switch url from an attribute to a child node for ajax redirects. (The old behaviour didn't work in safari)


Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Fri Jun  8 19:16:51 2007
@@ -832,7 +832,7 @@
              redirect != null;
              redirect = redirect.nextSibling) {
             if (redirect.nodeName == 'redirect') {
-                document.location = redirect.getAttribute("url");
+                document.location =  redirect.firstChild.firstChild.nodeValue;
             }
         }
     };

Modified: jifty/trunk/share/web/templates/__jifty/webservices/xml
==============================================================================
--- jifty/trunk/share/web/templates/__jifty/webservices/xml	(original)
+++ jifty/trunk/share/web/templates/__jifty/webservices/xml	Fri Jun  8 19:16:51 2007
@@ -5,7 +5,9 @@
 $writer->startTag("response");
 
 if (my $ext = Jifty->web->request->argument('_webservice_external_redirect')) {
-    $writer->startTag("redirect", url => $ext);
+    $writer->startTag("redirect");
+    $writer->cdataElement(url=> $ext);
+
     $writer->endTag();
 }
 else {