[claw-cvs] r81 - trunk/main/claw-html/src

[achiumenti at common-lisp.net]

Author: achiumenti
Date: Wed Sep  3 13:54:22 2008
New Revision: 81

Modified:
   trunk/main/claw-html/src/packages.lisp
   trunk/main/claw-html/src/tags.lisp
Log:
bufix on rewind 

Modified: trunk/main/claw-html/src/packages.lisp
==============================================================================
--- trunk/main/claw-html/src/packages.lisp	(original)
+++ trunk/main/claw-html/src/packages.lisp	Wed Sep  3 13:54:22 2008
@@ -190,9 +190,10 @@
            #:wcomponent-before-render
            #:wcomponent-after-render
            #:cform
+           #:action-object
+           #:action
            #:form-method
            #:cform>
-           #:action
            #:action-link
            #:action-link>
            #:action-link-parameters

Modified: trunk/main/claw-html/src/tags.lisp
==============================================================================
--- trunk/main/claw-html/src/tags.lisp	(original)
+++ trunk/main/claw-html/src/tags.lisp	Wed Sep  3 13:54:22 2008
@@ -303,7 +303,10 @@
        do (if (and (null body)
                    (or (keywordp elem)
                        (keywordp last-elem)))
-              (push (or (when (list-for-tag-attribute-p elem) (list-for-tag-attribute-value elem)) elem) attributes)
+              (push (or (when (list-for-tag-attribute-p elem) 
+                          (list-for-tag-attribute-value elem)) 
+                        elem) 
+                    attributes)
               (when elem
                 (push elem body))))
     (list (reverse attributes) (reverse body))))
@@ -1212,17 +1215,17 @@
     (make-component component-name (first fbody) (second fbody))))
 
 (defmethod htcomponent-rewind ((wcomponent wcomponent) (page page))
-  (let* ((template (wcomponent-template wcomponent))
-         (current-form (page-current-form page))
+  (let* ((current-form (page-current-form page))
          (call-rewind-methods-p (and (null *validation-errors*)
                                      current-form
                                      (string= (htcomponent-client-id current-form) (page-req-parameter page *rewind-parameter*)))))
     (when call-rewind-methods-p
       (wcomponent-before-rewind wcomponent page))
-    (if (listp template)
-        (dolist (tag template)
-          (htcomponent-rewind tag page))
-        (htcomponent-rewind template page))
+    (let ((template (wcomponent-template wcomponent)))
+      (if (listp template)
+          (dolist (tag template)
+            (htcomponent-rewind tag page))
+          (htcomponent-rewind template page)))
     (when call-rewind-methods-p
       (wcomponent-after-rewind wcomponent page))))