Changeset 1448

Timestamp:

2010-03-12 10:56:35 (3 years ago)

Author:

freya

Message:

new keuri-role 'control' introduced to define the control template itself

Location:

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

Files:

• basic-controls.js (modified) (9 diffs)
• date.js (modified) (2 diffs)

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

@@ -47 +47 @@
     InputControl.prototype.initElements = function() { 
    
-        var $input = this.getElement("input");
+        var $input = this.getElement(kf.ControlElements.REV_INPUT);
         
         var selector = "input";
         if(! $input){
-            // does not contain an input element TODO check if this is OK
-            this.setElement("input", $(this.getTemplate('control')));
+            // where to add?
+            this.setElement(kf.ControlElements.REV_INPUT, $(this.getTemplate(kf.ControlElements.REV_CONTROL)));
             $input = this.getElement();
         }
         if(! $input.is(selector)){
-            var $element = $(this.getTemplate('control'));
+            var $element = $(this.getTemplate(kf.ControlElements.REV_CONTROL));
             $element.attr('kauri-idref', $input.attr('kauri-idref'));
             $input.before($element).remove();
             kf.ControlElements.index($element, this.getForm(), true);
-            this.setElement("input", $input);
-            // hier herindexeren
+            this.setElement(kf.ControlElements.REV_INPUT, $input);
         }
         
@@ -125 +124 @@
     $.extend(OutputControl.prototype.templates, kf.Control.prototype.templates);
     $.extend(OutputControl.prototype.templates, {
-           input : "<span/>"
+           control : "<span kauri-role='input'/>"
     });
 
@@ -138 +137 @@
         if(! $output){
             // does not contain an input element TODO check if this is OK
-            this.setElement("input", $(this.getTemplate('input')));
+            this.setElement(kf.ControlElements.REV_CONTROL, $(this.getTemplate(kf.ControlElements.REV_CONTROL)));
             $output = this.getElement();
         }
         if(! $output.is(selector)){
-            $output.html(this.getTemplate('input'));
+            $output.html(this.getTemplate(kf.ControlElements.REV_CONTROL));
         }
         
@@ -189 +188 @@
     $.extend(CheckBoxControl.prototype.templates, kf.Control.prototype.templates);
     $.extend(CheckBoxControl.prototype.templates, {
-           input : "<input type='checkbox'>"
+           control : "<input type='checkbox'>"
     });
 
@@ -201 +200 @@
         if(! $input){
             // does not contain an input element TODO check if this is OK
-            this.setElement("input", $(this.getTemplate('input')));
+            this.setElement(kf.ControlElements.REV_CONTROL, $(this.getTemplate(kf.ControlElements.REV_CONTROL)));
             $input = this.getElement();
         }
         if(! $input.is(selector))
-            $input.html(this.getTemplate('input'));
+            $input.html(this.getTemplate(kf.ControlElements.REV_CONTROL));
         
         this._input = $input;
@@ -254 +253 @@
     $.extend(SelectionControl.prototype.templates, kf.Control.prototype.templates);
     $.extend(SelectionControl.prototype.templates, {
-           input : "<select kauri-role='input'>",
+           control : "<select kauri-role='input'>",
            refresh: "<button class='refresh' kauri-role='refresh'>"
     });
@@ -274 +273 @@
         if(! $select){
             // does not contain an input element TODO check if this is OK
-            $select = $(this.getTemplate('input'))
-            this.setElement("input", $select);
+            $select = $(this.getTemplate(kf.ControlElements.REV_CONTROL))
+            this.setElement(kf.ControlElements.REV_INPUT, $select);
         }
         if(! $select.is(selector)){
-            $select.html(this.getTemplate('input'));
+            $select.html(this.getTemplate(kf.ControlElements.REV_CONTROL));
             $select = $(selector,$select);
-            this.setElement("input", $select);
+            this.setElement(kf.ControlElements.REV_INPUT, $select);
         }
         // TODO read the options from the HTML - set them on the ready options object
@@ -439 +438 @@
     $.extend(TextareaControl.prototype.templates, kf.Control.prototype.templates);
     $.extend(TextareaControl.prototype.templates, {
-           input: "<textarea/>"
+           control: "<textarea/>"
     });
     
@@ -449 +448 @@
         if(! $textarea){
             // does not contain an input element TODO check if this is OK
-            this.setElement("input", $(this.getTemplate('input')));
+            this.setElement(kf.ControlElements.REV_INPUT), $(this.getTemplate(kf.ControlElements.REV_CONTROL));
             $textarea = this.getElement();
         }
         if(! $textarea.is(selector))
-            $textarea.html(this.getTemplate('input'));
+            $textarea.html(this.getTemplate(kf.ControlElements.REV_CONTROL));
         
         // defaults

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

@@ -320 +320 @@
     $.extend(DateControl.prototype.templates, kf.Control.prototype.templates);
     $.extend(DateControl.prototype.templates, {
-           input :"<div><input type='text' kauri-role='input'/></div>"
+           control :"<div><input type='text' kauri-role='input'/></div>"
     });
     DateControl.prototype.initElements = function ( ) {
@@ -328 +328 @@
         if(! $input){
             // does not contain an input element TODO check if this is OK
-            $input = $(this.getTemplate('input'))
-            this.setElement("input", $input);
+            $input = $(this.getTemplate(kf.ControlElements.REV_CONTROL));
+            this.setElement(kf.ControlElements.REV_INPUT, $input);
         }
         if(! $input.is(selector)){
-            $input.html(this.getTemplate('input'));
+            $input.html(this.getTemplate(kf.ControlElements.REV_CONTROL));
             $input = $("div > input",$input);
         }