merge master into branch

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 1016405..41681fe 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -12940,12 +12940,12 @@ Roo.extend(Roo.bootstrap.form.Input, Roo.bootstrap.Component,  {
         }
         if(typeof this.validator == "function"){
             var msg = this.validator(value);
-            if (typeof(msg) == 'string') {
-                this.invalidText = msg;
-            }
             if(msg !== true){
                 return false;
             }
+            if (typeof(msg) == 'string') {
+                this.invalidText = msg;
+            }
         }
         
         if(this.regex && !this.regex.test(value)){