Changeset 1864

Timestamp:

2011-02-23 13:16:35 (15 months ago)

Author:

mpo

Message:

This makes the tests work on chrome as well.
Note the required flag mentioned on the test-page though.

Location:

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

Files:

• main/kauri/static-{build}.key/kauri.forms/basic-validators.js (modified) (2 diffs)
• test/kauri.forms/test-basic-validators.js (modified) (1 diff)
• test/kauri.forms/testPage.html (modified) (1 diff)

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

@@ -168 +168 @@
                 
                 var me = this;
-                var result;
-                var successHandler = function( response) {
-                
-                    if (response && response.valid == true)
-                        result = me.notifySuccess();
-                    else if (response && response.valid == false)
-                        result = me.notifyFail(response.message, response.args);
-                    else
-                        result = me.notifyFail("i18n:Remote validation returned incompatible response!");
-                    return result;
+                var successHandler = function( response, txtstatus, xhr) {
+                
+                    if (response == null && xhr.status == 0) { // for chrome 
+                        return errorHandler(xhr, txtstatus, "empty response");
+                    }
+                    
+                    if (response && response.valid == true) {
+                        return me.notifySuccess();
+                    }
+                    
+                    if (response && response.valid == false) {
+                        return me.notifyFail(response.message, response.args);
+                    } 
+                    
+                    return me.notifyFail("i18n:Remote validation returned incompatible response!");
                 };
                 var errorHandler = function() {
-                
-                    result = me.notifyFail("i18n:Error while connecting to remote validation.");
-                    return result;
+                    return me.notifyFail("i18n:Error while connecting to remote validation.");
                 };
                 try {
@@ -199 +202 @@
                 }
             
-                return result; // will be undefined in the case of async calls
+                return;
             }
         }

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

@@ -255 +255 @@
     
     var report = "Checking result for validator/type: " + comp['org.kauriproject.registry-name'] + 
-                "- value= (" + val + ") - msg= (" + message + ")";
+                "- value= (" + val + ") - msg= (" + message + ") - location (" + comp.location + ")";
 
     if (expectMessage) 

trunk/modules/kauri-forms/kauri-forms-framework/src/test/kauri.forms/testPage.html

@@ -77 +77 @@
   <h2 id="banner"></h2>
   <h2 id="userAgent"></h2>
+  <h2>Note: to run these tests in google chrome: close all instances and start-up with --allow-file-access-from-files</h2>
 
   <!-- Test HTML -->