Changeset 1579

Timestamp:

2010-06-29 12:13:52 (3 years ago)

Author:

freya

Message:

solves #277 : Selecting null in selection-control causes dependent selection-control to call wrong url

• clear options when ajax call for options fail
• fix filling uricontext when loading options list

File:

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

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

@@ -201 +201 @@
     
                 me.parseOptions(data);
-            }
+            };
+            var errorcallback = function( data) {
+                
+                me.clearOptions(data);
+            };
+
             $.ajax( {
                 // take async setting from setup
@@ -209 +214 @@
                 dataType :"json",
                 success :callback,
+                error :errorcallback,
                 beforeSend: function(xhr) {
                 // setting datatype to json should be enough, unfortunately
@@ -238 +244 @@
             this.uriContext[key] = value;
         } else {
-            var context = key;
-            for (var k in context)
-                changedContext = changedContext || this.putContext(k, context[k], true);
+            if(this.uriContext[key] != undefined) { 
+                // delete from context
+                delete this.uriContext[key];
+                changedContext = true;
+            }
         }
             
@@ -283 +291 @@
     }
     
+     /**
+      * clear the options list
+      * <p>
+      * Note: Updating the HTML should not happen until "update" event triggers the various listeners (e.g.
+      * selection-control#updateOptions)
+      * </p>
+      * @param {Array} data
+      */
+     Options.prototype.clearOptions = function( data) {
+
+         this.set([], []);
+     }