From f4af3a3438919e09dd56e6626f2cf5e26c1d1eb3 Mon Sep 17 00:00:00 2001 From: leon Date: Tue, 28 Feb 2023 11:43:19 +0800 Subject: [PATCH] Roo/bootstrap/form/Input.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/form/Input.js | 2 +- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Roo/bootstrap/form/Input.js b/Roo/bootstrap/form/Input.js index eda126a7f7..3ceef289e2 100644 --- a/Roo/bootstrap/form/Input.js +++ b/Roo/bootstrap/form/Input.js @@ -682,7 +682,7 @@ Roo.extend(Roo.bootstrap.form.Input, Roo.bootstrap.Component, { validate : function(){ //if(this.disabled || this.validateValue(this.processValue(this.getRawValue()))){ if(this.disabled || this.validateValue(this.getRawValue())){ - Roo.log(this.getRawValue); + Roo.log(this.name); Roo.log('MARK INVALID'); this.markValid(); return true; diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index fb1bf246ab..08176b0104 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -12955,7 +12955,7 @@ Roo.extend(Roo.bootstrap.form.Input, Roo.bootstrap.Component, { validate : function(){ //if(this.disabled || this.validateValue(this.processValue(this.getRawValue()))){ if(this.disabled || this.validateValue(this.getRawValue())){ - Roo.log(this.getRawValue); + Roo.log(this.name); Roo.log('MARK INVALID'); this.markValid(); return true; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 3fddf39d97..b6df2569a1 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -548,7 +548,7 @@ if(!v){i.removeAttribute('disabled');return;}i.setAttribute('disabled','true');} this.inputEl().relayEvent('paste',this);this.indicator=this.indicatorEl();if(this.indicator){this.indicator.addClass(this.indicatorpos=='right'?'hidden':'invisible');}this.originalValue=this.getValue();if(this.validationEvent=='keyup'){this.validationTask=new Roo.util.DelayedTask(this.validate,this); this.inputEl().on('keyup',this.filterValidation,this);}else if(this.validationEvent!==false){this.inputEl().on(this.validationEvent,this.validate,this,{buffer:this.validationDelay});}if(this.selectOnFocus){this.on("focus",this.preFocus,this);}if(this.maskRe||(this.vtype&&this.disableKeyFilter!==true&&(this.maskRe=Roo.form.VTypes[this.vtype+'Mask']))){this.inputEl().on("keypress",this.filterKeys,this); }else{this.inputEl().relayEvent('keypress',this);}if(this.inputEl().is('input[type=password]')&&Roo.isSafari){this.inputEl().on('keydown',this.SafariOnKeyDown,this);}if(typeof(this.before)=='object'){this.before.render(this.el.select('.roo-input-before',true).first()); -}if(typeof(this.after)=='object'){this.after.render(this.el.select('.roo-input-after',true).first());}this.inputEl().on('change',this.onChange,this);},filterValidation:function(e){if(!e.isNavKeyPress()){this.validationTask.delay(this.validationDelay);}},validate:function(){if(this.disabled||this.validateValue(this.getRawValue())){Roo.log(this.getRawValue); +}if(typeof(this.after)=='object'){this.after.render(this.el.select('.roo-input-after',true).first());}this.inputEl().on('change',this.onChange,this);},filterValidation:function(e){if(!e.isNavKeyPress()){this.validationTask.delay(this.validationDelay);}},validate:function(){if(this.disabled||this.validateValue(this.getRawValue())){Roo.log(this.name); Roo.log('MARK INVALID');this.markValid();return true;}this.markInvalid();return false;},validateValue:function(A){if(this.getVisibilityEl().hasClass('hidden')){return true;}if(A.length<1){if(this.allowBlank){return true;}return false;}if(A.lengththis.maxLength){return false;}if(this.vtype){var vt=Roo.form.VTypes;if(!vt[this.vtype](A,this)){return false;}}if(typeof this.validator=="function"){var B=this.validator(A);if(typeof(B)=='string'){this.invalidText=B;}if(B!==true){return false; }}if(this.regex&&!this.regex.test(A)){return false;}return true;},fireKey:function(e){if(e.isNavKeyPress()){this.fireEvent("specialkey",this,e);}},focus:function(A){if(this.rendered){this.inputEl().focus();if(A===true){this.inputEl().dom.select();}}return this; -- 2.39.2