Ticket #266: composite.diff

composite.js

@@ -89 +89 @@
 
         var type = this.getType();
         var memberTypes = type.getMemberTypes();
+        
+        if (!type.containerElement && !type.itemElement && !type.itemLabelElement) {
+          // if no custom layout elements are specified, use default dl-dd-dt
+          type.containerElement = "dl";
+          type.itemElement = "dd";
+          type.itemLabelElement = "dt";
+        } else {
+          if (!type.containerElement) {
+            type.containerElement = "div";
+          }
+          if (!type.itemElement) {
+            type.itemElement = "div";
+          }
+          if (!type.itemLabelElement) {
+            type.itemLabelElement = "div";
+          }
+        }
 
         for ( var memberName in memberTypes) {
             var memberType = memberTypes[memberName];
@@ -98 +115 @@
     }
     
     CompositeControl.prototype.createChildElements = function (id, container, layout) {
+        var type = this.getType();
         if (!container) {
              throw "[CompositeControl#createChildElements] No container to work with.";           
-        } else if (!container.is("dl")) {
-            container = $("<dl/>").appendTo(container);
+        } else if (!container.is(type.containerElement)) {
+            container = $("<" + type.containerElement + "/>").appendTo(container);
             this.setElement(kf.ControlElements.REV_CONTAINER, container);
         }
         
+        if(type.containerClass) {
+          container.addClass(type.containerClass);
+        }
+
         // since there is no layout we will use our own default layout
-        var item = $("<dt kauri-role='label'/><dd kauri-role='item'/>").appendTo(container);
+        var item = $("<" + type.itemLabelElement + " kauri-role='label'/><" + type.itemElement + " kauri-role='item'/>").appendTo(container);
+        
+        if (type.itemClass) {
+          $(item.filter(type.itemElement+"[kauri-role='item']")).addClass(type.itemClass);
+        }
+        if (type.itemLabelClass) {
+          $(item.filter(type.itemLabelElement+"[kauri-role='label']")).addClass(type.itemLabelClass);
+        }
+        
+        if (type.itemWrapElement) {
+          var $itemWrap = $("<" + type.itemWrapElement + "/>");
+          if (type.itemWrapClass) {
+            $itemWrap.addClass(type.itemWrapClass);
+          }
+          item.wrapAll($itemWrap);
+        }
         return item;
     }