Changeset 193

Timestamp:

06/17/06 20:16:49 (3 years ago)

Author:

scorfield

Message:

Fixes #79 by correcting the test for parent verbs and fixing how instantiate handles the arguments attribute.

Location:

fusebox5/verbs

Files:

• argument.cfm (modified) (1 diff)
• instantiate.cfm (modified) (2 diffs)

fusebox5/verbs/argument.cfm

@@ -69 +69 @@
                         }
                 }
-                if (fb_.validParent) {
+                if (not fb_.validParent) {
                         fb_throw("fusebox.badGrammar.argumentInvalidParent",
                                                 "Verb 'argument' has invalid parent verb",

fusebox5/verbs/instantiate.cfm

@@ -55 +55 @@
                 // arguments - string default ""
                 if (not structKeyExists(fb_.verbInfo.attributes,"arguments")) {
-                        fb_.verbInfo.attributes.arguments = "";
                         // prepare to gather up <argument> tags, if any:
                         fb_.verbInfo.data.arguments = "";
@@ -120 +119 @@
                 
                 // update arguments if we had any child <argument> tags:
-                if (structKeyExists(fb_.verbInfo,"data") and fb_.verbInfo.data.arguments is not "") {
+                if (not structKeyExists(fb_.verbInfo.attributes,"arguments")) {
                         fb_.verbInfo.attributes.arguments = fb_.verbInfo.data.arguments;
                 }