Changeset 1449

Timestamp:

2010-03-12 13:29:32 (2 years ago)

Author:

freya

Message:

remove filter function that prevents controls inside a kauri-layout to be indexed

Location:

trunk

Files:

• modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js (modified) (4 diffs)
• samples/kauri-forms-sample/src/main/kauri/pages/collection-control.html.xml (modified) (2 diffs)

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

@@ -218 +218 @@
         if (space.is(kauriSelector) ) 
             space.each(indexor);
-            // then go through matching children, but only once (even if they match multiple times)
-        var matching = $($.unique($(kauriSelector, space))).filter(function(){
-            // TODO should we do this this way or should be traverse the tree ourselves (performance?)
-            var $this = $(this);
-            var revParents = $this.parents("[" + ControlElements.ATTR_LAYOUT + "]");
-
-            return (revParents == null || revParents.length==0);
-        });      
-        matching.each(indexor);
+
+        $.unique($(kauriSelector, space)).each(indexor);
         
         
@@ -957 +950 @@
         
         // allow control-specific initialization of containment elements
-        this.initContainerElements(this.getParent() ? this.getParent().getElement() : this.getElement());
+        this.initContainerElements();
         
         //initialize options
@@ -2013 +2006 @@
      * @private
      */
-    AbstractContainerControl.prototype.initContainerElements = function(container, create){
+    AbstractContainerControl.prototype.initContainerElements = function(create){
          var id = this.getAbsoluteId();
 
@@ -2164 +2157 @@
      */
     AbstractContainerControl.prototype.createChildControl = function(id, type, position){
-    
+         if (type == undefined) 
+             throw "[AbstractContainerControl.createChildControl] Unknown type for member: " + id + " of control " +
+             this.getAbsoluteId();
+         
+         
         var controlType = type.control;
         var extender = {};

trunk/samples/kauri-forms-sample/src/main/kauri/pages/collection-control.html.xml

@@ -86 +86 @@
         <label kauri-role="label" kauri-idref="countries">Countries</label>
 
-        <table kauri-idref="countries" kauri-type="collection" kauri-item="country">
+        <table kauri-idref="countries" kauri-type="collection" >
           <thead>
             <tr>
@@ -99 +99 @@
 
           <tbody kauri-role="container">
-            <tr kauri-layout="country">
+            <tr kauri-layout="/countries">
             
               <td >