[Checkins] SVN: z3c.formjsdemo/trunk/ Got first demo working again. Yipee!

[Stephan Richter]

Log message for revision 77544:
  Got first demo working again. Yipee!
  

Changed:
  U   z3c.formjsdemo/trunk/buildout.cfg
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/browser/__init__.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/browser.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/button.pt
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/configure.zcml
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/layer.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/__init__.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/configure.zcml
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py

-=-
Modified: z3c.formjsdemo/trunk/buildout.cfg
===================================================================
--- z3c.formjsdemo/trunk/buildout.cfg	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/buildout.cfg	2007-07-06 22:00:53 UTC (rev 77544)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . z3c.form z3c.formjs
 parts = demo
 
 [zope3]

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/browser/__init__.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/browser/__init__.py	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/browser/__init__.py	2007-07-06 22:00:53 UTC (rev 77544)
@@ -0,0 +1 @@
+# Make a package

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/browser.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/browser.py	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/browser.py	2007-07-06 22:00:53 UTC (rev 77544)
@@ -1,3 +1,21 @@
+##############################################################################
+#
+# Copyright (c) 2007 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Browser code for JS button demo.
+
+$Id: layer.py 75942 2007-05-24 14:53:46Z srichter $
+"""
+__docformat__="restructuredtext"
 import os.path
 import zope.interface
 from z3c.form import form, button, field
@@ -3,9 +21,9 @@
 from z3c.form.interfaces import IWidgets
 from z3c.formui import layout
-from z3c.formjs import jsbutton, jsevent
+from z3c.formjs import jsaction, jsevent
 
 class IButtons(zope.interface.Interface):
-    show = jsbutton.JSButton(title=u'Show JavaScript')
-    hide = jsbutton.JSButton(title=u'Hide JavaScript')
+    show = jsaction.JSButton(title=u'Show JavaScript')
+    hide = jsaction.JSButton(title=u'Hide JavaScript')
 
 class IFields(zope.interface.Interface):
@@ -15,24 +33,24 @@
         description=u"The file to show.",
         required=True,
         default=u"None",
-        values=(u"None",u"browser.py",u"button.pt",u"configure.zcml")
+        values=(u"None", u"browser.py", u"button.pt", u"configure.zcml")
         )
 
 class ButtonForm(layout.FormLayoutSupport, form.Form):
-
     buttons = button.Buttons(IButtons)
     fields = field.Fields(IFields)
 
-    @jsevent.handler(buttons['show'])
-    def apply(self, id):
+    @jsaction.handler(buttons['show'])
+    def apply(self, selector):
         return '$("#javascript").slideDown()'
 
-    @jsevent.handler(buttons['hide'])
-    def apply(self, id):
+    @jsaction.handler(buttons['hide'])
+    def apply(self, selector):
         return '$("#javascript").slideUp()'
 
-    @jsevent.handler(fields['file'], event=jsevent.CHANGE)
-    def handleFileChange(self, id):
+    @jsaction.handler(fields['file'].field, event=jsevent.CHANGE)
+    def handleFileChange(self, selector):
+        id = selector.widget.id
         return '''
             $(".code").hide();
             $("#"+$("#%s").val().replace(".","-")).show();''' % id

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/button.pt
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/button.pt	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/button/button.pt	2007-07-06 22:00:53 UTC (rev 77544)
@@ -17,8 +17,5 @@
 
 <h1>Generated JS</h1>
 <pre id="javascript" style="display: none;"
-     tal:content="view/jsevents:renderer/render" />
+     tal:content="provider:IJavaScript" />
 
-<script type="text/javascript"
-	tal:content="view/jsevents:renderer/render">
-</script>
\ No newline at end of file

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/configure.zcml
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/configure.zcml	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/configure.zcml	2007-07-06 22:00:53 UTC (rev 77544)
@@ -14,7 +14,7 @@
   <!-- Examples -->
 
   <include package=".button" />
-  <include package=".calculator" />
-  <include package=".validator" />
+  <!--include package=".calculator" /-->
+  <!--include package=".validator" /-->
 
 </configure>

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/layer.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/layer.py	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/layer.py	2007-07-06 22:00:53 UTC (rev 77544)
@@ -14,6 +14,7 @@
 """
 $Id: layer.py 75942 2007-05-24 14:53:46Z srichter $
 """
+__docformat__="restructuredtext"
 
 from z3c.form.interfaces import IFormLayer
 from z3c.layer.pagelet import IPageletBrowserLayer

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/__init__.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/__init__.py	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/__init__.py	2007-07-06 22:00:53 UTC (rev 77544)
@@ -31,7 +31,7 @@
 class ICSS(interfaces.ICSS):
     """CSS viewlet manager."""
 
-class IJavaScript(IViewletManager, IJQueryJavaScriptBrowserLayer):
+class IJavaScript(IViewletManager):
     """JavaScript viewlet manager."""
 
 DemoCSSViewlet = CSSViewlet('demo.css')

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/configure.zcml
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/configure.zcml	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/skin/configure.zcml	2007-07-06 22:00:53 UTC (rev 77544)
@@ -46,6 +46,24 @@
       layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
       />
 
+  <viewlet
+      name="jquery"
+      manager="z3c.formjsdemo.skin.IJavaScript"
+      class="jquery.javascript.browser.JQueryJavaScriptViewlet"
+      permission="zope.Public"
+      layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
+      />
+
+
+  <viewlet
+      name="subscriptions"
+      manager="z3c.formjsdemo.skin.IJavaScript"
+      view="z3c.formjs.interfaces.IHaveJSSubscriptions"
+      class="z3c.formjs.jsevent.JSSubscriptionsViewlet"
+      permission="zope.Public"
+      layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
+      />
+
   <!-- layout template -->
   <z3c:layout
       for="*"

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py	2007-07-06 21:59:36 UTC (rev 77543)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py	2007-07-06 22:00:53 UTC (rev 77544)
@@ -13,7 +13,9 @@
         required=True)
 
 
-class ValidatorForm(layout.FormLayoutSupport, jsvalidator.MessageValidator, form.Form):
+class ValidatorForm(
+    layout.FormLayoutSupport, jsvalidator.MessageValidator, form.Form):
+
     zope.interface.implements(interfaces.IAJAXValidator)
     fields = field.Fields(IFields)