Changeset 1924

Timestamp:

2011-08-04 13:52:13 (10 months ago)

Author:

sdm

Message:

radioselection.js: changed the "input[checked]" selector to "input[type='radio']:checked" (fixes #468)
radioselection.js: use options.trimValues instead of this.trimToOptions
Also added test cases for radioselection-control and selection-control (set-get value tests still fail!)

Location:

trunk/modules/kauri-forms

Files:

• kauri-forms-extra/src/main/kauri/static/radioselection/js/radioselection.js (modified) (3 diffs)
• kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js (modified) (1 diff)
• kauri-forms-framework/src/test/kauri.forms/test-radioselection.js (added)
• kauri-forms-framework/src/test/kauri.forms/testPage.html (modified) (2 diffs)

trunk/modules/kauri-forms/kauri-forms-extra/src/main/kauri/static/radioselection/js/radioselection.js

@@ -112 +112 @@
         var $radioControlDiv = this.getElement();
         
-        var $checkedRadioButton = $radioControlDiv.find("input[checked]");
+        var $checkedRadioButton = $radioControlDiv.find("input[type='radio']:checked"); //input[checked]
         return $checkedRadioButton.val();
     }
@@ -134 +134 @@
        
        // clear options from list that are not available
-       value = trimToOptions(value, values);
+       value = this.options.trimValues(value);
        
        if (value === undefined  // if no matches left after trim 
@@ -144 +144 @@
        return value;
    }
-    
-   function trimToOptions(val, values) {
-      
-      if (val === undefined || values === undefined) return undefined;
-      if (val.constructor != Array) {
-          var wrapped = trimToOptions([val], values); //wrap
-          return (wrapped != undefined) ? wrapped[0] : undefined; // unwrapped
-      }
-      
-      var result = []; 
-      for (var i = 0; i< val.length; i++) {
-          var testval = val[i];
-          if ($.valueInArray(testval, values) >= 0) {
-              result[result.length] = testval;
-          }
-      }
-      return (result.length == 0 ) ? undefined : result;
-  }
     
 

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-basic-controls.js

@@ -301 +301 @@
 });
 
+test("selection-control", function() {
+
+    // create
+    var $main = $('#main').show();
+    var $form = $('<form />').appendTo($main);
+
+    var id = "selection1";
+    var fconf = { "members": {}};
+    fconf.members[id] = {
+        "base": "string",
+        "label": "Number select",
+        "control": {
+            "base": "selection-control",
+            "options": {
+                  "data": [{name:"one",id:1}, {name:"two",id:2}, {name:"three",id:3}],
+                  "valueTemplate": "{id}",
+                  "labelTemplate": "{name}"
+            }
+        }
+    };
+
+    var form = new $.org.kauriproject.forms.Form($form, fconf);
+    
+
+    expect(8);
+    
+    
+    // verify creation of control
+    var c = form.findControl(id);
+    ok(c != null, "control creation passed");
+    ok(c.getForm() == form, "control form ok");
+    equal(c.getId(), id, "control id checked");
+    
+    // verify creation  of control elements
+    var $input = $('select[kauri-idref*="'+id+'"]', $form);
+    var $messages = $("span[kauri-idref*='"+id+"']", $form);
+    $messages.html("text that should get cleared upon validation");
+    sameJq(c.getElement(), $input, "input element found and indexed.");
+    sameJq(c.getElement('messages'), $messages, "messages element found and indexed.")  
+    
+    equal(c.getValue(), 1, "initial value should be the first");
+    
+    // verify setting some value
+    c.setValue(3);
+    equal(c.getValue(), 3, "setValue should trigger a change of value");
+    
+    c.setWireValue(2);
+    equal(c.getValue(), 2, "setWireValue should trigger a change of value");
+    
+    // cleanup
+    $main.html("").hide();
+    
+});
+
 
 test("trimmed selection-control stringvalues", function() {

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html

@@ -47 +47 @@
   <script type="text/javascript" src="../../main/kauri/static-{build}.key/kauri.forms/date.js" ></script>
   <script type="text/javascript" src="../../main/kauri/static-{build}.key/kauri.forms/numeric-range.js" ></script>
+  <script type="text/javascript" src="../../../../kauri-forms-extra/src/main/kauri/static/radioselection/js/radioselection.js" ></script>
   <!--
   <script type="text/javascript" src="../../main/kauri/static/js/location.js" ></script>
@@ -86 +87 @@
   <script type="text/javascript" src="test-date.js" ></script>
   <script type="text/javascript" src="test-numeric-range.js" ></script>
+  <script type="text/javascript" src="test-radioselection.js" ></script>
    
   <!-- Haven't found a way to test the control since the page has to be completly loaded to be able to load the maps api