[Checkins] SVN: z3c.formjsdemo/trunk/ Improved widget switcher code.

[Stephan Richter]

Log message for revision 79185:
  Improved widget switcher code.
  

Changed:
  U   z3c.formjsdemo/trunk/buildout.cfg
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/browser.py
  U   z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/configure.zcml
  D   z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/widgetswitch.js

-=-
Modified: z3c.formjsdemo/trunk/buildout.cfg
===================================================================
--- z3c.formjsdemo/trunk/buildout.cfg	2007-08-23 21:32:35 UTC (rev 79184)
+++ z3c.formjsdemo/trunk/buildout.cfg	2007-08-23 21:32:56 UTC (rev 79185)
@@ -1,5 +1,5 @@
 [buildout]
-develop = . z3c.formjs
+develop = . z3c.formjs z3c.form z3c.formui
 parts = demo
 
 [zope3]

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py	2007-08-23 21:32:35 UTC (rev 79184)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/validator/browser.py	2007-08-23 21:32:56 UTC (rev 79185)
@@ -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.
+#
+##############################################################################
+"""Validator Form
+
+$Id$
+"""
+__docformat__="restructuredtext"
 import os.path
 import zope.interface
 import zope.schema

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/browser.py
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/browser.py	2007-08-23 21:32:35 UTC (rev 79184)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/browser.py	2007-08-23 21:32:56 UTC (rev 79185)
@@ -19,7 +19,7 @@
 import zope.component
 import zope.interface
 from zope.app.session.interfaces import ISession
-from zope.viewlet.viewlet import JavaScriptViewlet
+from zope.viewlet.viewlet import CSSViewlet, JavaScriptViewlet
 
 from z3c.form import field, form
 from z3c.form.interfaces import IWidgets, DISPLAY_MODE
@@ -27,7 +27,8 @@
 from z3c.formui import layout
 from z3c.formjsdemo.widgetswitch import interfaces, content
 
-WidgetSwitchJSViewlet = JavaScriptViewlet('widgetswitch.js')
+WidgetSwitchJSViewlet = JavaScriptViewlet('jquery-switch.js')
+WidgetSwitchCSSViewlet = CSSViewlet('widgetswitch.css')
 
 class ContactForm(layout.FormLayoutSupport,
                   jsswitch.WidgetModeSwitcher,
@@ -35,12 +36,6 @@
     fields = field.Fields(interfaces.IContact)
     label = u'Contact Add Form'
 
-    def updateWidgets(self):
-        self.widgets = zope.component.getMultiAdapter(
-            (self, self.request, self.getContent()), IWidgets)
-        self.widgets.mode = DISPLAY_MODE
-        self.widgets.update()
-
     def getContent(self):
         session = ISession(self.request)['z3c.formjsdemo.widgetswitch']
         obj = session.get('content')

Modified: z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/configure.zcml
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/configure.zcml	2007-08-23 21:32:35 UTC (rev 79184)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/configure.zcml	2007-08-23 21:32:56 UTC (rev 79185)
@@ -6,17 +6,26 @@
 
   <!-- Resources -->
 
+  <browser:viewlet
+      name="jquery-switch.js"
+      view=".browser.ContactForm"
+      manager="z3c.formjsdemo.skin.IJavaScript"
+      class=".browser.WidgetSwitchJSViewlet"
+      permission="zope.Public"
+      layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
+      />
+
   <browser:zrt-resource
-      name="widgetswitch.js"
-      file="widgetswitch.js"
+      name="widgetswitch.css"
+      file="widgetswitch.css"
       layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
       />
 
   <browser:viewlet
-      name="widgetswitch.js"
+      name="widgetswitch.css"
       view=".browser.ContactForm"
-      manager="z3c.formjsdemo.skin.IJavaScript"
-      class=".browser.WidgetSwitchJSViewlet"
+      manager="z3c.formjsdemo.skin.ICSS"
+      class=".browser.WidgetSwitchCSSViewlet"
       permission="zope.Public"
       layer="z3c.formjsdemo.layer.IDemoBrowserLayer"
       />

Deleted: z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/widgetswitch.js
===================================================================
--- z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/widgetswitch.js	2007-08-23 21:32:35 UTC (rev 79184)
+++ z3c.formjsdemo/trunk/src/z3c/formjsdemo/widgetswitch/widgetswitch.js	2007-08-23 21:32:56 UTC (rev 79185)
@@ -1,22 +0,0 @@
-function switchWidget(widgetId, code) {
-    element = $('#' + widgetId + '-row div.widget');
-    element.html(code);
-}
-
-function saveWidget(widgetId, msg) {
-    element = $('#' + widgetId + '-row div.error');
-    if (element) {
-        element.remove();
-    }
-    $('#' + widgetId + '-row').append(
-        '<div class="error">' + msg+  '</div>');
-
-    if (msg != '') {
-        $('#' + widgetId).removeClass('valid');
-        $('#' + widgetId).addClass('invalid');
-    }
-    else {
-        $('#' + widgetId).removeClass('invalid');
-        $('#' + widgetId).addClass('valid');
-    }
-}