Changeset 257 for framework/trunk/verbs/if.cfm

Timestamp:

11/03/06 22:25:22 (2 years ago)

Author:

scorfield

Message:

Fixes #160 by pushing generation of condition down into true/false. Added test case.

Files:

• framework/trunk/verbs/if.cfm (modified) (1 diff)

framework/trunk/verbs/if.cfm

@@ -68 +68 @@
                 
                 // compile <if>
-                fb_appendLine("<cfif #fb_.verbInfo.attributes.condition#>");
-        }
-
-        // compile </if>
-        if (fb_.verbInfo.executionMode is "end") {
-                fb_appendLine("</cfif>");
+                // <true> and <false> can occur in either order so we defer the conditional
+                // to the child tags...
+                fb_.verbInfo.condition = fb_.verbInfo.attributes.condition;
+                fb_.verbInfo.ifUsed = false;
+        } else {
+                // compile </if>
+                if (fb_.verbInfo.ifUsed) {
+                        fb_appendLine("</cfif>");
+                }
         }
 </cfscript>