[Checkins] SVN: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/ make ajax request handler return json encoded string if the original return value was not a string already.

[Paul Carduner]

Log message for revision 90022:
  make ajax request handler return json encoded string if the original return value was not a string already.

Changed:
  U   z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/ajax.py
  U   z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsswitch.py
  U   z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsvalidator.py

-=-
Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/ajax.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/ajax.py	2008-08-19 22:09:43 UTC (rev 90021)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/ajax.py	2008-08-20 02:23:38 UTC (rev 90022)
@@ -84,6 +84,8 @@
 
     def __call__(self, view):
         result = mapply(self.func, (view,), view.request)
+        if type(result) != str and type(result) != unicode:
+            return cjson.encode(result)
         return result
 
     def __repr__(self):

Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsswitch.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsswitch.py	2008-08-19 22:09:43 UTC (rev 90021)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsswitch.py	2008-08-20 02:23:38 UTC (rev 90022)
@@ -145,7 +145,7 @@
         widget = self._getWidget('input')
         data, errors = self.extractData()
         if errors:
-            return errors[0].message
+            return unicode(errors[0].message)
         self.applyChanges(data)
         return ''
 

Modified: z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsvalidator.py
===================================================================
--- z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsvalidator.py	2008-08-19 22:09:43 UTC (rev 90021)
+++ z3c.formjs/branches/pcardune-client-notify-r87806/src/z3c/formjs/jsvalidator.py	2008-08-20 02:23:38 UTC (rev 90022)
@@ -57,5 +57,5 @@
     def validate(self):
         data, errors = self._validate()
         if errors:
-            return errors[0].message
+            return unicode(errors[0].message)
         return u'' # all OK