Ticket #259: updateOptions_default.patch

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

@@ -276 +276 @@
     }
 
     /**
-     * SelectionControl options can depend on values of other controls, this method will register the necessary handler to listen to
-     * the valueChanged events of those controls.
-     */
-    SelectionControl.prototype.initEventWiring = function() {
-
-        var options = this.options;
-        if (options.toShare() && options.initEventWiringDone)
-            return; // no need to re-init shared options, avoiding multiple updates when one suffices
-        
-        // in all other cases we should loop over dependency-controls
-        // and register a context-update callback on the value-change-event of each of them
-        var depends = this.depends;
-        var context = {};
-        for ( var name in depends) {
-            var path = depends[name];
-            var control = this.findControl(path);
-            context[name] = control.getValue();
-            var updateContext = function( event) {
-
-                options.putContext(name, control.getValue());
-            }
-            control.valueChanged(updateContext);
-            options.putContext(context); // at least trigger reading the dependent context once
-        }
-        
-        options.initEventWiringDone = true;
-    }
-
-    /**
      * Handle the changed options on the type level, by adapting the HTML/control
      */
     SelectionControl.prototype.updateOptions = function( userValues, labels) {

kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/control.js

@@ -833 +833 @@
     
     /**
      * Perform control specific HTML updating of options
+     *
+     * Default implementation: use the first value to set the value for this control.
      * @param {Array} values Option values
      * @param {Array} labels Option labels
      */
     Control.prototype.updateOptions = function(values, labels){
-    
+
+        var value = values[0];
+        
+        value = value || this.getValue();
+        
+        var noValidation = (this.valueState == kf.Control.STATE_INIT);
+        this.setValue(value, noValidation);
     }
     
     
@@ -913 +921 @@
         // register event-wiring to happen when form completes
         this.getForm().initComplete(function(){
         
-            me.initEventWiring();
+            me._initEventWiring();
         });
     }
     
@@ -926 +934 @@
     
     }
     
+    Control.prototype._initEventWiring = function(){
+        var options = this.options;
+        if(options){
+            if (options.toShare() && options.initEventWiringDone)
+                return; // no need to re-init shared options, avoiding multiple updates when one suffices
+            
+            // in all other cases we should loop over dependency-controls
+            // and register a context-update callback on the value-change-event of each of them
+            var depends = this.depends;
+            var context = {};
+            for ( var name in depends) {
+                var path = depends[name];
+                var control = this.findControl(path);
+                context[name] = control.getValue();
+                var updateContext = function( event) {
+
+                    options.putContext(name, control.getValue());
+                }
+                control.valueChanged(updateContext);
+                options.putContext(context); // at least trigger reading the dependent context once
+            }
+            
+            options.initEventWiringDone = true;
+        }
+        
+        this.initEventWiring();
+    }
+    
     /**
      * Perform control specific event-wiring allowing to listen to events of other controls in the form.
      *
      * @see #_initEvents
      */
     Control.prototype.initEventWiring = function(){
-    
+        
     }
     
     /**

kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/field.js

@@ -260 +260 @@
     Options.prototype.parseOptions = function( data) {
 
         data = data || [];
+        
+        if (data.constructor != Array) {
+            data = [data];
+        }
+        
         // loop through options and build value and label arrays
         var last = data.length;
         var values = [];