[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Formulator/Widgets/XUL - TextWidget.py:1.1.4.1.14.1 XULWidget.py:1.1.4.1.14.1

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/Formulator/Widgets/XUL
In directory cvs.zope.org:/tmp/cvs-serv12181/lib/python/Zope/App/Formulator/Widgets/XUL

Modified Files:
      Tag: Zope3InWonderland-branch
	TextWidget.py XULWidget.py 
Log Message:
- Added permission_id attribute to adapter and utility directives.

- Got rid of old getView, getResource, and getDefaultViewName.
  Renamed getRequestView to getView (and so on).

  Changed view interface to use context, rather than getContext.

  Introduced notion of presentation types (e.g. IBrowserPresentation, 
  which is cleaner than IBrowserPublisher).

- Began converting to get/queryFoo, which is much nicer.

- Many formatting fixups.



=== Zope3/lib/python/Zope/App/Formulator/Widgets/XUL/TextWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
 # 
 ##############################################################################
-"""
-
-$Id$
-"""
-
-from Zope.App.Formulator.Widgets.XUL.XULWidget import XULWidget
-from Zope.App.Formulator.Widgets.XUL.XULWidget import renderElement
-
-
-class TextWidget(XULWidget):
-    """Text widget
-    """
-
-    __implements__ = XULWidget.__implements__
-
-    propertyNames = XULWidget.propertyNames + \
-                     ['displayMaxWidth', 'extra', 'default']
-
-    tag = 'textbox'
-    default = ''
-    displayMaxWidth = ''
-    extra = ''
-
-    
-    def render(self, REQUEST=None):
-        """Renders this widget as HTML using property values in field.
-        """
-        displayMaxWidth = self.getValue('displayMaxWidth') or 0
-        if displayMaxWidth > 0:
-            return renderElement(self.getValue('tag'),
-                                 id = self.getContext().id,
-                                 value = self._getValueToInsert(REQUEST),
-                                 cssClass = self.getValue('cssClass'),
-                                 maxlength = displayMaxWidth,
-                                 extra = self.getValue('extra'))
-        else:
-            return renderElement(self.getValue('tag'),
-                                 id = self.getContext().id,
-                                 value = self._getValueToInsert(REQUEST),
-                                 cssClass = self.getValue('cssClass'),
-                                 extra = self.getValue('extra'))
+"""
+
+$Id$
+"""
+
+from Zope.App.Formulator.Widgets.XUL.XULWidget import XULWidget
+from Zope.App.Formulator.Widgets.XUL.XULWidget import renderElement
+
+
+class TextWidget(XULWidget):
+    """Text widget
+    """
+
+    __implements__ = XULWidget.__implements__
+
+    propertyNames = XULWidget.propertyNames + \
+                     ['displayMaxWidth', 'extra', 'default']
+
+    tag = 'textbox'
+    default = ''
+    displayMaxWidth = ''
+    extra = ''
+
+    
+    def render(self, REQUEST=None):
+        """Renders this widget as HTML using property values in field.
+        """
+        displayMaxWidth = self.getValue('displayMaxWidth') or 0
+        if displayMaxWidth > 0:
+            return renderElement(self.getValue('tag'),
+                                 id = self.context.id,
+                                 value = self._getValueToInsert(REQUEST),
+                                 cssClass = self.getValue('cssClass'),
+                                 maxlength = displayMaxWidth,
+                                 extra = self.getValue('extra'))
+        else:
+            return renderElement(self.getValue('tag'),
+                                 id = self.context.id,
+                                 value = self._getValueToInsert(REQUEST),
+                                 cssClass = self.getValue('cssClass'),
+                                 extra = self.getValue('extra'))


=== Zope3/lib/python/Zope/App/Formulator/Widgets/XUL/XULWidget.py 1.1.4.1 => 1.1.4.1.14.1 ===
     def getValueFromRequest(self, REQUEST):
         """ """
-        return REQUEST.get('field_'+self.getContext().id, None)
+        return REQUEST.get('field_'+self.context.id, None)
 
 
     def _getValueToInsert(self, REQUEST):
         """ """
-        field = self.getContext()
+        field = self.context
         if REQUEST and REQUEST.has_key('field_'+field.id):
             return REQUEST['field_'+field.id]
         else:
@@ -61,7 +61,7 @@
         """
         return renderElement(self.getValue('tag'),
                              type = self.getValue('type'),
-                             name = self.getContext().id,
+                             name = self.context.id,
                              value = self._getValueToInsert(REQUEST),
                              cssClass = self.getValue('cssClass'),
                              extra = self.getValue('extra'))
@@ -72,7 +72,7 @@
         """
         return renderElement(self.getValue('tag'),
                              type = 'hidden',
-                             name = self.getContext().id,
+                             name = self.context.id,
                              value = self._getValueToInsert(REQUEST),
                              cssClass = self.getValue('cssClass'),
                              extra = self.getValue('extra'))