Changeset 306

Timestamp:

06/20/08 16:28:41 (7 months ago)

Author:

matt

Message:

Allow the addition of new form items on the fly, relative to existing items.

Files:

• trunk/formal/examples/dynamic.py (added)
• trunk/formal/examples/main.py (modified) (1 diff)
• trunk/formal/form.py (modified) (4 diffs)
• trunk/setup.py (modified) (1 diff)

trunk/formal/examples/main.py

@@ -28 +28 @@
-    'formal.examples.richtextarea.RichTextAreaFormPage',
-    'formal.examples.sequences.SequencesFormPage',
+    'formal.examples.dynamic.DynamicFormPage',
-    ]
-

trunk/formal/form.py

@@ -290 +290 @@
-        # Forward to FormItems methods
-        self.add = self.items.add
+        self.addLast = self.items.addLast
+        self.addFirst = self.items.addFirst
+        self.addBefore = self.items.addBefore
+        self.addAfter = self.items.addAfter
-        self.getItemByName = self.items.getItemByName
-
@@ -367 +371 @@
-        # Forward to FormItems methods
-        self.add = self.items.add
+        self.addLast = self.items.addLast
+        self.addFirst = self.items.addFirst
+        self.addBefore = self.items.addBefore
+        self.addAfter = self.items.addAfter
-        self.getItemByName = self.items.getItemByName
-
@@ -462 +470 @@
-
-    def add(self, item):
+        return self.__add(item, self.items.append)
+
+
+    def addLast(self, item, ref=None):
+        if ref is not None:
+            return self.__refToItem(ref).addLast(item)
+        return self.add(item)
+
+
+    def addFirst(self, item, ref=None):
+        if ref is not None:
+            return self.__refToItem(ref).addFirst(item)
+        return self.__add(item, lambda item: self.items.insert(0, item))
+
+
+    def addBefore(self, item, ref):
+        ref = self.__refToItem(ref)
+        if ref.itemParent is not self.itemParent:
+            return ref.itemParent.addBefore(item, ref)
+        pos = self.items.index(ref)
+        return self.__add(item, lambda item: self.items.insert(pos, item))
+
+
+    def addAfter(self, item, ref):
+        ref = self.__refToItem(ref)
+        if ref.itemParent is not self.itemParent:
+            return ref.itemParent.addAfter(item, ref)
+        pos = self.items.index(ref)
+        return self.__add(item, lambda item: self.items.insert(pos+1, item))
+
+
+    def __refToItem(self, ref):
+        if isinstance(ref, (str, unicode)):
+            return self.getItemByName(ref)
+        return ref
+
+
+    def __add(self, item, adder):
-        # Check the item name is unique
-        if item.name in [i.name for i in self.items]:
@@ -467 +513 @@
-                    (item.name, self))
-        # Add to child items and set self the parent
-self.items.append
+adder
-        item.setItemParent(self.itemParent)
-        return item

trunk/setup.py

@@ -3 +3 @@
-setup(
-    name='formal',
-7
+8
-    description='HTML forms framework for Nevow',
-    author='Matt Goodall',