Changeset 1576

Timestamp:

2010-06-29 07:23:32 (3 years ago)

Author:

freya

Message:

small bugfixes to get advanced-sontrols sample get back to working

Location:

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms

Files:

• control.js (modified) (1 diff)
• date.js (modified) (1 diff)

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js

@@ -1796 +1796 @@
            var parent = this.getParent();
            var parentId = "";
+           var id = "";
+           
            if (parent) 
                parentId = parent.getGroupId();
-           var id = null;
-           if(!parent.groupChildrenInLayoutIndex)
+               
+           if(parent == undefined || !parent.groupChildrenInLayoutIndex)
                id = $.concatPath(parentId, this.getId());
            else 
                id = $.concatPath(parentId, "#");
+       
            this._groupId = id;
        }

trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/date.js

@@ -338 +338 @@
 
             var options = {
-                dateFormat: type['user-format'].pattern,
+                dateFormat: (type['user-format']) ? type['user-format'].pattern : undefined,
                 buttonImage: this.staticResourceUri + "/img/1x1t.gif", // the image will actually be set with css so just pass a dummy img src
                 buttonText: "Choose a date",