Changeset 1918

Timestamp:

2011-07-26 10:00:28 (10 months ago)

Author:

jgou

Message:

• improved checking of rows and cols attributes for textarea-control, this fixes #466 (tested in IE8, FX3, FX5, chrome11)
• add qunit test for textarea-control (including test for #466)

Location:

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

Files:

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

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

@@ -414 +414 @@
         }
 
-
-            ($textarea.attr('cols') != -1)? (this.cols = $textarea.attr('cols')) : $textarea.attr('cols', this.cols);
-            ($textarea.attr('rows') != -1)? (this.rows = $textarea.attr('rows')) : $textarea.attr('rows', this.rows);
-            // attr('readonly') always returns a value, even if it's not specifically set
-            // the only way to check this, is by using an attribute selector
-            ($('textarea[readonly]' ,$('<div />').append($textarea.clone())).size() == 1)? (this.readonly = $textarea.attr('readonly')) : $textarea.attr('readonly', this.readonly);           
+        var $unselectableElement = $('<div />').append($textarea.clone());
+        // workaround to prevent #466 caused by: attr('cols') and attr('rows') always return a value in most browsers
+        // note: in jquery 1.6 this should get easier (see .attr() and .prop() in jquery docs)
+        ($('textarea[cols]' ,$unselectableElement).size() == 1)? (this.cols = $textarea.attr('cols')) : $textarea.attr('cols', this.cols);
+        ($('textarea[rows]' ,$unselectableElement).size() == 1)? (this.rows = $textarea.attr('rows')) : $textarea.attr('rows', this.rows);
+        // attr('readonly') always returns a value, even if it's not specifically set
+        // the only way to check this, is by using an attribute selector
+        ($('textarea[readonly]' ,$unselectableElement).size() == 1)? (this.readonly = $textarea.attr('readonly')) : $textarea.attr('readonly', this.readonly);           
     }
     

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

@@ -220 +220 @@
 
 
+test("textarea-control", function() {
+
+    // create
+    var $main = $('#main').show();
+    var $form = $('<form />').appendTo($main);
+
+    var okValue = "test";
+    var nokValue = "n*" + okValue;
+    var mockSet = makeMockValidator(okValue);
+    var mockVal = mockSet[0];
+    var mockMsg = mockSet[1];
+    var cols = 80;
+    var rows = 10;
+    var readonly = true;
+
+    var id = "t0";
+    var fconf = { "members": {}};
+    fconf.members[id] = {
+        "base": "string",
+        "control": {
+            "base": "textarea-control",
+            "cols": cols,
+            "rows": rows,
+            "readonly": readonly
+        },
+        "validators": [mockVal]
+    };
+
+    var form = new $.org.kauriproject.forms.Form($form, fconf);
+
+    
+    expect(15);
+
+    // 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 $textarea = $('textarea[kauri-idref*="'+id+'"]', $form);
+    var $messages = $("span[kauri-idref*='"+id+"']", $form);
+    $messages.html("text that should get cleared upon validation");
+    sameJq(c.getElement(), $textarea, "textarea element found and indexed.");
+    sameJq(c.getElement('messages'), $messages, "messages element found and indexed.")  
+    
+    // verify setting some value
+    c.setWireValue(okValue);
+
+    equal($messages.html(), "", "validation error clearing.");
+    equal(c.getValue(), okValue, "get-set value match.");
+
+    
+    // verify events
+    var changes = 0;
+    c.valueChanged( function() {
+        changes++
+    });
+
+    // mock user interaction: set other value on checkbox & trigger change
+    $textarea.val(nokValue).change();
+
+    equal(changes, 1, "receiving value-change event");
+    equal(c.hasChanges(), true, "change state")
+    equal($messages.html(), mockMsg, "validation error setting.");
+    equal(c.getValue(), nokValue, "get-set value match.");
+
+    // mock user interaction: blur without change
+    c.getElement("input").blur();
+
+    equal(changes, 1, "checking possible duplicate value-change event");
+    
+    // #466 : check if rows and cols properties are set correctly
+    equal($textarea.attr("cols"),cols,"check cols value");
+    equal($textarea.attr("rows"),rows,"check rows value");
+    equal($textarea.attr("readonly"),readonly,"check readonly value")
+
+    // cleanup
+    $main.html("").hide();
+});
+
+
 test("trimmed selection-control stringvalues", function() {