Changeset 1530

Timestamp:

2010-05-11 09:40:36 (3 years ago)

Author:

freya

Message:

fixes #316 : selection-control: null-text not null. if no labels defined: use a copy of option values, not a reference.

File:

• trunk/modules/kauri-forms/kauri-forms-framework/src/main/kauri/static-{build}.key/kauri.forms/field.js (modified) (3 diffs)

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

@@ -141 +141 @@
     */
     Options.prototype.set = function( values, labels) {
-
-        labels = labels || values;
+        labels = labels || values.slice();
+
         if (this.nullable) {
             for (var i = values.length; i>0; i--) {
@@ -148 +148 @@
                 labels[i] = labels[i-1];
             }
-                    
             values[0] = undefined;
             labels[0] = this['null-text'];
@@ -273 +272 @@
                 if (this.labelTemplate)
                     labels[j] = this.labelTemplate.expand(option, false);
-            } else
-                values[j] = option;
+            } else {
+                values[j] = option;    
+            }
             if (this.type)
                 values[j] = this.type.parseWireValue(values[j]);