From 0211fa57a41582f84fd35744639daa0729ebede9 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 11 May 2018 17:47:56 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 3c1fe2dd88..6cf2b4f4da 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -9364,7 +9364,7 @@ Roo.extend(Roo.bootstrap.Input, Roo.bootstrap.Component, { if(this.indicator){ var ar = this.el.select('label > span',true); - if (!ar.length) { + if (!ar.elements.length) { Roo.log("could not find label > span on element"); Roo.log(this); return; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 86bad25cce..9efcbc40da 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -375,7 +375,7 @@ if(this.getValue().length||this.forceFeedback){this.el.select('.form-control-fee if(this.inputEl().dom.selectionEnd>0){B=(this.inputEl().dom.selectionEnd-this.inputEl().dom.selectionStart-this.getValue().length==0)?true:false;}if(((A.getKey()==8||A.getKey()==46)&&this.getValue().length==1)){A.preventDefault();this.setValue('');return; }if(B&&A.getCharCode()>31&&!A.ctrlKey){A.preventDefault();var cc=String.fromCharCode(A.getCharCode());this.setValue(A.shiftKey?cc:cc.toLowerCase());}},adjustWidth:function(A,w){A=A.toLowerCase();if(typeof w=='number'&&Roo.isStrict&&!Roo.isSafari){if(Roo.isIE&&(A=='input'||A=='textarea')){if(A=='input'){return w+2; }if(A=='textarea'){return w-2;}}else if(Roo.isOpera){if(A=='input'){return w+2;}if(A=='textarea'){return w-2;}}}return w;},setFieldLabel:function(v){if(!this.rendered){return;}this.fieldLabel=v;if(this.indicator){var ar=this.el.select('label > span',true); -if(!ar.length){Roo.log("could not find label > span on element");Roo.log(this);return;}this.el.select('label > span',true).first().dom.innerHTML=(v===null||v===undefined?'':v);return;}this.el.select('label',true).first().dom.innerHTML=(v===null||v===undefined?'':v); +if(!ar.elements.length){Roo.log("could not find label > span on element");Roo.log(this);return;}this.el.select('label > span',true).first().dom.innerHTML=(v===null||v===undefined?'':v);return;}this.el.select('label',true).first().dom.innerHTML=(v===null||v===undefined?'':v); }}); // Roo/bootstrap/TextArea.js Roo.bootstrap.TextArea=function(A){Roo.bootstrap.TextArea.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.TextArea,Roo.bootstrap.Input,{cols:false,rows:5,readOnly:false,warp:'soft',resize:false,value:false,html:false,getAutoCreate:function(){var A=(!this.labelAlign)?this.parentLabelAlign():this.labelAlign; -- 2.39.2