From 73869e319298ba900c24a8121a9cd8d56dace60f Mon Sep 17 00:00:00 2001 From: edward Date: Wed, 13 Jan 2016 11:55:52 +0800 Subject: [PATCH] Roo/bootstrap/Img.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Img.js | 4 ++-- roojs-bootstrap-debug.js | 4 ++-- roojs-bootstrap.js | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Roo/bootstrap/Img.js b/Roo/bootstrap/Img.js index 243cdb88a6..ba58f209b6 100644 --- a/Roo/bootstrap/Img.js +++ b/Roo/bootstrap/Img.js @@ -66,8 +66,8 @@ Roo.extend(Roo.bootstrap.Img, Roo.bootstrap.Component, { var _this = this; Roo.each(['xs', 'sm', 'md', 'lg'], function(size){ - var target = size . 'Url'; - if(!_this[target]){ + + if(!_this[size + 'Url']){ return; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 08624fdaf9..1a167d1aaf 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -1376,8 +1376,8 @@ Roo.extend(Roo.bootstrap.Img, Roo.bootstrap.Component, { var _this = this; Roo.each(['xs', 'sm', 'md', 'lg'], function(size){ - var target = size . 'Url'; - if(!_this[target]){ + + if(!_this[size + 'Url']){ return; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 0ebef0ea81..fd5352288f 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -36,9 +36,9 @@ A.removeClass(['fa-minus','fa-plus']).addClass(['fa-plus']);}},toggleEl:function A.dom.innerHTML=v;},getTitle:function(){var A=this.titleEl();if(!A){return '';}return A.dom.innerHTML;},setRightTitle:function(v){var t=this.el.select('.panel-header-right',true).first();if(!t){return;} t.dom.innerHTML=v;}}); //Roo/bootstrap/Img.js -Roo.bootstrap.Img=function(A){Roo.bootstrap.Img.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.Img,Roo.bootstrap.Component,{imgResponsive:true,border:'',src:'',href:false,target:false,xsUrl:'',smUrl:'',mdUrl:'',lgUrl:'',getAutoCreate:function(){if(this.src||(!this.xsUrl&&!this.smUrl&&!this.mdUrl&&!this.lgUrl)){return this.createSingleImg();}var A={tag:'div',cls:'roo-image-responsive-group',cn:[]};var _this=this;Roo.each(['xs','sm','md','lg'],function(B){var C=B.'Url';if(!_this[C]){return;}var D={tag:'img',cls:(_this.imgResponsive)?'img-responsive':'',html:_this.html||A.html,src:_this[B]} -D.cls+=' roo-image-responsive-'+B;if(['rounded','circle','thumbnail'].indexOf(_this.border)>-1){A.cls+=' img-'+_this.border;}if(_this.alt){A.alt=_this.alt;}if(_this.href){var a={tag:'a',href:_this.href,cn:[D]};if(this.target){a.target=_this.target;}} -A.cn.push((_this.href)?a:D);});return A;},createSingleImg:function(){var A={tag:'img',cls:(this.imgResponsive)?'img-responsive':'',html:null} +Roo.bootstrap.Img=function(A){Roo.bootstrap.Img.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.Img,Roo.bootstrap.Component,{imgResponsive:true,border:'',src:'',href:false,target:false,xsUrl:'',smUrl:'',mdUrl:'',lgUrl:'',getAutoCreate:function(){if(this.src||(!this.xsUrl&&!this.smUrl&&!this.mdUrl&&!this.lgUrl)){return this.createSingleImg();}var A={tag:'div',cls:'roo-image-responsive-group',cn:[]};var _this=this;Roo.each(['xs','sm','md','lg'],function(B){if(!_this[B+'Url']){return;}var C={tag:'img',cls:(_this.imgResponsive)?'img-responsive':'',html:_this.html||A.html,src:_this[B]} +C.cls+=' roo-image-responsive-'+B;if(['rounded','circle','thumbnail'].indexOf(_this.border)>-1){A.cls+=' img-'+_this.border;}if(_this.alt){A.alt=_this.alt;}if(_this.href){var a={tag:'a',href:_this.href,cn:[C]};if(this.target){a.target=_this.target;}} +A.cn.push((_this.href)?a:C);});return A;},createSingleImg:function(){var A={tag:'img',cls:(this.imgResponsive)?'img-responsive':'',html:null} A.html=this.html||A.html;A.src=this.src||A.src;if(['rounded','circle','thumbnail'].indexOf(this.border)>-1){A.cls+=' img-'+this.border;}if(this.alt){A.alt=this.alt;}if(this.href){var a={tag:'a',href:this.href,cn:[A]};if(this.target){a.target=this.target;}}return (this.href)?a:A;},initEvents:function(){if(!this.href){this.el.on('click',this.onClick,this);}},onClick:function(e){Roo.log('img onclick');this.fireEvent('click',this,e);}}); //Roo/bootstrap/Link.js Roo.bootstrap.Link=function(A){Roo.bootstrap.Link.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.Link,Roo.bootstrap.Component,{href:false,target:false,preventDefault:false,anchor:false,alt:false,getAutoCreate:function(){var A={tag:'a'};if(this.anchor===false){A.html=this.html||'';A.href=this.href||'#';}else {A.name=this.anchor;if(this.html!==false){A.html=this.html;}if(this.href!==false){A.href=this.href;}}if(this.alt!==false){A.alt=this.alt;}if(this.target!==false){A.target=this.target;}return A;},initEvents:function(){if(!this.href||this.preventDefault){this.el.on('click',this.onClick,this);}},onClick:function(e){if(this.preventDefault){e.preventDefault();} -- 2.39.2