Changeset 1954 for trunk

Timestamp:

2011-09-21 13:47:29 (8 months ago)

Author:

mpo

Message:

fixes #457 and makes the tests run again on IE
This introduces a new property 'allowResize' for selection controls. See #457 for the rationale behind it.

Location:

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

Files:

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

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

@@ -261 +261 @@
     
     SelectionControl.prototype.showRefresh = false;
+    SelectionControl.prototype.allowResize = true;
 
     /** Specific control element initialisation */
@@ -313 +314 @@
      */
     SelectionControl.prototype.updateOptions = function( values, userValues, labels) {
+        
         values = values || [];
         labels = labels || userValues;
@@ -322 +324 @@
         var $select = this.getElement();
         $select.empty(); // or $select.html("");
-
+        
         // loop options from type and construct the inner HTML
         var last = userValues.length;
@@ -337 +339 @@
         } 
         this.setValue(value, noValidation);
-        // on IE we need to trigger repaint by
-        $select.blur(); // calling blur
+
+        // on IE we need to trigger repaint by forcing width manipulation
+        // however this reset can be unwanted and therefore overridden through allowResize
+        if (this.allowResize) {
+            $select.css('width', 0); 
+            $select.css('width', '');
+        }
     };
 

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

@@ -293 +293 @@
     
     // #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(Number($textarea.attr("cols")), cols,"check cols value");
+    equal(Number($textarea.attr("rows")), rows,"check rows value");
     equal($textarea.attr("readonly"),"readonly","check readonly value")
 
@@ -541 +541 @@
     
     // 2. manually set options uri to options/main.js and call refresh
+    var needsWait = true;
     var opts = c.options;
     opts.uri = new $.org.kauriproject.UriTemplate("options/main.json", {skipEscape: true});
@@ -552 +553 @@
         $main.html("").hide();
 
-        start();
-    });
-    
+        QUnit.start();
+        needsWait = false;
+    });
+
     opts.refresh();
-    stop();
+    
+    if (needsWait) { // apparently the order of start/stop on IE is different.
+        QUnit.stop();
+    }
     
 });