From 53924d8e3401b9d163a3227d8deb6673f67dc86c Mon Sep 17 00:00:00 2001 From: edward Date: Wed, 13 Jan 2016 12:04:15 +0800 Subject: [PATCH] Roo/bootstrap/Img.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/Img.js | 5 +++-- roojs-bootstrap-debug.js | 5 +++-- roojs-bootstrap.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Roo/bootstrap/Img.js b/Roo/bootstrap/Img.js index 5aa99c4a53..0b5bdf1acf 100644 --- a/Roo/bootstrap/Img.js +++ b/Roo/bootstrap/Img.js @@ -82,8 +82,9 @@ Roo.extend(Roo.bootstrap.Img, Roo.bootstrap.Component, { var s = ['xs', 'sm', 'md', 'lg']; - Roo.log(s.splice(s.indexOf(size), 1)); - Roo.each(s.splice(s.indexOf(size), 1), function(ss){ + s.splice(s.indexOf(size), 1); + + Roo.each(s, function(ss){ Roo.log(ss); img.cls += ' hidden-' + ss; }); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index c9323dcc0e..39371308df 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -1392,8 +1392,9 @@ Roo.extend(Roo.bootstrap.Img, Roo.bootstrap.Component, { var s = ['xs', 'sm', 'md', 'lg']; - Roo.log(s.splice(s.indexOf(size), 1)); - Roo.each(s.splice(s.indexOf(size), 1), function(ss){ + s.splice(s.indexOf(size), 1); + + Roo.each(s, function(ss){ Roo.log(ss); img.cls += ' hidden-' + ss; }); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 0f9214d77e..a90cc69453 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -37,7 +37,7 @@ A.dom.innerHTML=v;},getTitle:function(){var A=this.titleEl();if(!A){return '';}r 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){if(!_this[B+'Url']){return;}var C={tag:'img',cls:(_this.imgResponsive)?'img-responsive':'',html:_this.html||A.html,src:_this[B+'Url']} -C.cls+=' roo-image-responsive-'+B;var s=['xs','sm','md','lg'];Roo.log(s.splice(s.indexOf(B),1));Roo.each(s.splice(s.indexOf(B),1),function(ss){Roo.log(ss);C.cls+=' hidden-'+ss;});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;}} +C.cls+=' roo-image-responsive-'+B;var s=['xs','sm','md','lg'];s.splice(s.indexOf(B),1);Roo.each(s,function(ss){Roo.log(ss);C.cls+=' hidden-'+ss;});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 -- 2.39.2