Changeset 1919 for trunk

Timestamp:

2011-07-28 12:58:39 (10 months ago)

Author:

jgou

Message:

ensure that datepicker is enabled/disabled according to enabling/disabling of date-control + provide testcase ; this fixes #459

Location:

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

Files:

• main/kauri/static-{build}.key/kauri.forms/date.js (modified) (2 diffs)
• test/kauri.forms/test-date.js (modified) (2 diffs)

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

@@ -394 +394 @@
                         
             $input.datepicker(options);
-
-            // for some reason adding the "disable" option does not work but calling .datepicker("disable") does work
-            if((this.initial != undefined && this.initial.enable != undefined && !this.initial.enable))
-                $input.datepicker("disable");
         }
         this._input = $input;
@@ -427 +423 @@
         value = value || "";
         this._input.val(value);
-    }    
+    }
+    
+    DateControl.prototype.enable = function(){
+        this['<super.call>']('enable');
+        if(this.useDatePicker) {
+            this.getElement().datepicker("enable");
+        }
+    }
+    
+    DateControl.prototype.disable = function(){
+        this['<super.call>']('disable');
+        if(this.useDatePicker) {
+            this.getElement().datepicker("disable");
+        }
+    }
     
     controlTypes.put( "date-control", DateControl);

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/test-date.js

@@ -273 +273 @@
 
     // test
-    expect(13);
+    expect(17);
 
     
@@ -311 +311 @@
     c.getElement("input").val(ok2Value).change();
     equal(changes, 3, "receiving value-change event");
-    equal(c.hasChanges(), true, "change state")
+    equal(c.hasChanges(), true, "change state");
+    
+    // #459: enable/disable control behaviour
+    c.disable();
+    ok(c.getElement()[0].disabled, "input element disabled when control is disabled");
+    ok(c.getElement().datepicker("isDisabled"), "datepicker disabled when control is disabled");
+    c.enable();
+    ok(!c.getElement()[0].disabled, "input element enabled when control is enabled");
+    ok(!c.getElement().datepicker("isDisabled"), "datepicker enabled when control is enabled");
 
     // cleanup