Changeset 1441

Timestamp:

2010-02-19 16:14:07 (2 years ago)

Author:

freya

Message:

put jquery wrappers in elementindex / no more need to wrap layout templates in a unnecessary span-element
for stable version, please stick to revision 1433

Location:

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

Files:

• collection.js (modified) (3 diffs)
• control.js (modified) (13 diffs)
• form.js (modified) (1 diff)

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

@@ -62 +62 @@
     }
     $.extend(CollectionControl.prototype.templates, {
-        layout: "<tr><td ><span kauri-role='label'/><span kauri-role='input'/><span kauri-role='messages'/></td></tr>",
+        layout: "<tr><td ><span kauri-role='label'/><span kauri-role='input'/><span kauri-role='messages'/><span kauri-role='delete'/></td></tr>",
         container: "<table kauri-role='container'></table>"
     });
@@ -220 +220 @@
 
         // Make sure the item role is associated with the control
-        var $newItem = kf.ControlElements.lookup(childControl, "item", false);
+        var $newItem = kf.ControlElements.lookup(childControl, kf.ControlElements.REV_ITEM, false);
 
         // If the new item contains an element with delete role, add event handler to it
@@ -254 +254 @@
 
         // remove it from the page
-        child.getElement("item").remove();
+        child.getElement(kf.ControlElements.REV_ITEM).remove();
 
         // clear the index

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

@@ -146 +146 @@
         forceReIndexing = forceReIndexing || false;
         
-        var indexor = function(i){
+        var indexor = function(index){
         
             var $this = $(this);
@@ -164 +164 @@
             var rev = $this.attr(ControlElements.ATTR_REV);
             
-            store.addElementIndex(index, rev, this);
+            store.addElementIndex(index, rev, $this);
             
             //add type property if known
@@ -171 +171 @@
             $this.attr(ControlElements.ATTR_INDEX, index);
         };
+
+        var wrapIndexor = function($wrap){
+            //var $first = $($eltArray[0]);
+            index = ""; 
+            var idref = $wrap.attr(ControlElements.ATTR_IDREF) || "";
+            if (idref.length == 0 || idref.charAt(0) != '/') 
+                index = $wrap.parents("[" + ControlElements.ATTR_INDEX + "]:first").attr(ControlElements.ATTR_INDEX);
+            if (idref) {
+                index = $.concatPath(index, idref);
+                
+            }
+            
+            var rev = $wrap.attr(ControlElements.ATTR_REV);
+            
+            store.addElementIndex(index, rev, $wrap.children());
+            
+            //add type property if known
+          //  store.addTypeAndControl(index, $elt.attr(ControlElements.ATTR_TYPE), $this.attr(ControlElements.ATTR_CONTROL));
+
+            $wrap.attr(ControlElements.ATTR_INDEX, index);
+        };
         
         // find all kauri-idref and kauri-role marked elements and index them
@@ -180 +201 @@
         if (space.is(kauriSelector)) 
             space.each(indexor);
-        // then go through matching children, but only once (even if they match multiple times)
+            // 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?)
@@ -187 +208 @@
 
             return ($this.attr(ControlElements.ATTR_IDREF)!=undefined || revParents == null || revParents.length==0);
-        });        
+        });   
+    
         matching.each(indexor);
     }
+    
     
     
@@ -259 +282 @@
         var index = control.getAbsoluteId();
         
-        var elm = form.getElementIndex(index, relation); // if marked with kauri- attributes we should find it in the indexes
-        var $elm = null;
-        
-        if (!elm) { 
+        var $elm = form.getElementIndex(index, relation); // if marked with kauri- attributes we should find it in the indexes
+        
+        
+        if (!$elm) { 
             if(relation == ControlElements.REV_INPUT &&  form.getElementIndex(index).length == 1){
-                elm = form.getElementIndex(index)[0];
+                $elm = form.getElementIndex(index)[0];
             
-                $elm = $(elm);
+            
                 
                 if ($elm) {
                     $elm.attr(ControlElements.ATTR_INDEX, index);
                     $elm.attr(ControlElements.ATTR_REV, relation);
-                    elm = $elm.get(0);
-                    form.addElementIndex(index, relation, elm);
+                    form.addElementIndex(index, relation, $elm);
                 } 
             }
         }
-        else {
-            $elm = $(elm);
-        }
-        
-        if (elm) 
+       
+        if ($elm) 
             control.setElement(relation, $elm);
         return $elm;
@@ -447 +466 @@
         }
         
+        var $elm = $(elm);
+
+        
         return this._operateIndex(index, relation, function(i){
         
@@ -454 +476 @@
             this.elementIndex[i] = elms;
         }, function(i, r){
-        
             var elms = this.elementIndex[i] = this.elementIndex[i] || ControlElements.newElements();
             if (elms.meta[r]) 
                 throw "[ControlElements#addElementIndex] index already in use: " + i + "#" + r;
+            
             elms.meta[r] = elm;
             if (r == ControlElements.REV_ITEM) {// special case: items double as lookup-spaces!
@@ -480 +502 @@
             return this.elementIndex;
         
+        var $elm;
         return this._operateIndex(index, relation, function(i){
-        
-            return this.elementIndex[i];
+            $elm = this.elementIndex[i];
+            return $elm;
         }, function(i, r){
         
             this.elementIndex[i] = this.elementIndex[i] || ControlElements.newElements();
-            return this.elementIndex[i].meta[r];
+            $elm = this.elementIndex[i].meta[r];
+            return $elm;
         });
     }
@@ -692 +716 @@
         // If no label is found then the control id will be used instead.  
         // In that case no default creation will happen! (additional requirement for element creation)
-        // But if a label is specifief in the template, then that takes precendence over what is in the fconf
+        // But if a label is specified in the template, then that takes precendence over what is in the fconf
         var $lbl = ControlElements.lookup(this, ControlElements.REV_LABEL);
         
@@ -1768 +1792 @@
         }
 
-        if (layout) {
+       /* if (layout) {
             layout.hide();
-        }
+        }*/
     }
     
@@ -1812 +1836 @@
             }
             var $layout = layout.clone();
-            if($layout.length>1){
-                var $wrap = $("<span/>");
-                $wrap.append($layout);
-                $layout = $wrap;
-            }
 
             if (childAtPosition != null && childAtPosition.length == 1) {
@@ -1824 +1843 @@
             }
             
-            newElements.attr(ControlElements.ATTR_REV, ControlElements.REV_ITEM);
+            
+            //newElements.attr(ControlElements.ATTR_REV, ControlElements.REV_ITEM);
+
+            if(true){
+                // hier item index berekenen en in elementindex steken
+                // daarna gewoon de elemennten indexeren
+                
+                var idref = id;
+                if (idref.length == 0 || idref.charAt(0) != '/') 
+                    index = newElements.parents("[" + ControlElements.ATTR_INDEX + "]:first").attr(ControlElements.ATTR_INDEX);
+                if (idref) {
+                    index = $.concatPath(index, idref);
+                }
+                
+                this.getForm().addElementIndex(index, ControlElements.REV_ITEM, newElements);
+                
+/*                
+                var $wrap = $("<kauri-layout/>");
+                $wrap.append(newElements.clone());
+
+                $wrap.attr(ControlElements.ATTR_REV, ControlElements.REV_ITEM);
+                $wrap.attr(ControlElements.ATTR_IDREF, id);
+                //newElements = $wrap;
+                var form = this.getForm();
+                ControlElements.index($wrap, form, true);
+                return newElements;*/
+            }
+
         }
         
         newElements.attr(ControlElements.ATTR_IDREF, id);
-        
-        
-        
         var form = this.getForm();
         ControlElements.index(newElements, form, true); // we force re-indexing cause layout-template elements will already be

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

@@ -154 +154 @@
             throw "[Form#setRootElement] Root element already set.";
         this.rootElement = elm;
-        this.addElementIndex("/", elm);
+        this.addElementIndex("/", $(elm));
     }