Changeset 1914

Timestamp:

2011-07-20 15:04:26 (10 months ago)

Author:

mpo

Message:

test on #457 and additional fix for the numeric see r1905 and r1906

Location:

trunk/modules/kauri-forms/kauri-forms-framework/src

Files:

• main/kauri/static-{build}.key/kauri.forms/basic-controls.js (modified) (2 diffs)
• main/kauri/static-{build}.key/kauri.forms/basic-formatters.js (modified) (1 diff)
• test/kauri.forms/test-basic-controls.js (modified) (4 diffs)

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

@@ -207 +207 @@
      */
     CheckBoxControl.prototype.normaliseValue = function (value) {
-        if (value && value.constructor == Boolean) return value; // note Boolean object holding false would become true with !! operation
-        return !!value; //anything becomes true, nothing or false becomes false
+        if (value && value.constructor == Boolean && typeof value === 'object') return value; // note Boolean object holding false would become true with !! operation
+        return new Boolean(!!value); //anything becomes true, nothing or false becomes false
     }
 
@@ -331 +331 @@
         } 
         this.setValue(value, noValidation);
-        $select.blur(); // force event on control to repaint on ie
+        // on IE we need to trigger repaint by
+        $select.blur(); // calling blur
     }
 

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

@@ -83 +83 @@
                     var thousandSep = $.getThousandSeparator();
                     var decimalSep = $.getDecimalSeparator();
-                    var regex = new RegExp("^(-\s?)?([0-9]{1,3}("+thousandSep+"[0-9]{3})*(\\"+decimalSep+"[0-9]+)?|\\"+decimalSep+"[0-9]+)$");
+                    function toRegexp(c) {
+                        return c == '.' ? "\\." : c;
+                    }
+                    var expression = "^(-\\s*)?[0-9]{1,3}("+toRegexp(thousandSep)+"[0-9]{3})*("+toRegexp(decimalSep)+"[0-9]+)?$";
+                    var regex = new RegExp(expression);
                     
                     var match = regex.exec(valstr);
                     if(match && match.length > 0){
-                        var parts = valstr.split(thousandSep);
+                        var parts = valstr.split(toRegexp(thousandSep));
                         valstr = parts.join("");
                     }

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

@@ -164 +164 @@
     
 
-    expect(15);
-
+    expect(18);
+    
     
     // verify creation of control
@@ -172 +172 @@
     ok(c.getForm() == form, "control form ok");
     equal(c.getId(), id, "control id checked");
+    
+    // check initial value
+    var initial = c.getValue();
+    ok(initial == false, "initially we should be logically false");
+    ok(initial.constructor == Boolean && typeof initial === 'object', "and the actual type should be nicely converted");
     
     // verify creation  of control elements
@@ -184 +189 @@
 
     equal($messages.html(), "", "validation error clearing.");
-    equal(c.getValue(), okValue, "get-set value match.");
+    equal(c.getValue(), okValue, "get-set value match (logically).");
+    equal(c.getValue().constructor, Boolean, "get-set value matches type.");
 
     
@@ -367 +373 @@
 });
 
+
+test("IE8/9 width of async selection-control (see #457)", function() {
+
+    // create
+    var $main = $('#main').show();
+    var $form = $('<form />').appendTo($main);
+
+    var id = "s2";
+    var fconf = { "members": {}};
+    fconf.members[id] = {
+        "base": "string",
+        "control": {
+            "base": "selection-control"
+        }
+    };
+
+    var form = new $.org.kauriproject.forms.Form($form, fconf);
+
+    //expect(18);
+
+
+    // 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");
+    
+    // 1. get size of control now
+    var $sel = c.getElement();
+    var initWidth = $sel.width();
+    
+    // 2. manually set options uri to options/main.js and call refresh
+    var opts = c.options;
+    opts.uri = new $.org.kauriproject.UriTemplate("options/main.json", {skipEscape: true});
+    opts.update(function() {
+        // 3. check size 
+        var afterWidth = $sel.width();
+        ok(afterWidth > initWidth,"selector with options should be bigger (before = "+initWidth+" , after = "+afterWidth+").");
+
+        //     
+        // cleanup
+        $main.html("").hide();
+
+        start();
+    });
+    
+    opts.refresh();
+    stop();
+    
+});
+
 });