From ca26a014356e7983653bf55c342756419f45643f Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 31 Mar 2021 17:47:44 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Card.js --- Roo/bootstrap/Card.js | 6 +++--- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js index ed69fdb482..0d47c36285 100644 --- a/Roo/bootstrap/Card.js +++ b/Roo/bootstrap/Card.js @@ -758,13 +758,13 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { return; } - var hw = he.dom.naturalHeight / he.dom.naturalWidth; + var hw = he.naturalHeight / heom.naturalWidth; // wide image = < 0 // tall image = > 1 //var w = he.dom.naturalWidth; - var ww = he.dom.width; + var ww = he.width; if (hw > 1) { - he.setSize( ww * (1/hw), ww); + Roo.get(he).setSize( ww * (1/hw), ww); } } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index a276d11e5c..820e3dae44 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -2344,7 +2344,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { this.fireEvent('rotate', this, true); } this.header_imageEl = this.el.select('.card-img-top',true).first(); - this.header_imageEl.on('load', this.onHeaderImageLoad, this, [ this.header_imageEl ]); + this.header_imageEl.on('load', this.onHeaderImageLoad, this ); }, getDragData : function(e) diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index ad232dc22b..68d742b82b 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -95,11 +95,11 @@ if(A.hasClass('d-none')){A.removeClass('d-none');}return A;},getCardImageTop:fun this.dropZone.onNodeEnter=this.onNodeEnter.createDelegate(this);this.dropZone.onNodeOver=this.onNodeOver.createDelegate(this);this.dropZone.onNodeOut=this.onNodeOut.createDelegate(this);this.dropZone.onNodeDrop=this.onNodeDrop.createDelegate(this);}if(this.collapsable){this.el.select('.card-header',true).on('click',this.onToggleCollapse,this); }if(this.rotateable){this.el.select('.card-header',true).on('click',this.onToggleRotate,this);}this.collapsableEl=this.el.select('.roo-collapsable').first();this.footerEl=this.el.select('.card-footer').first();this.collapsableToggleEl=this.el.select('.roo-collapse-toggle'); this.headerContainerEl=this.el.select('.roo-card-header-ctr').first();this.headerEl=this.el.select('.card-header',true).first();if(this.rotated){this.el.addClass('roo-card-rotated');this.fireEvent('rotate',this,true);}this.header_imageEl=this.el.select('.card-img-top',true).first(); -this.header_imageEl.on('load',this.onHeaderImageLoad,this,[this.header_imageEl]);},getDragData:function(e){var A=this.getEl();if(A){var B={source:this,copy:false,nodes:this.getEl(),records:[]};B.ddel=A.dom;Roo.log(A.getWidth());B.ddel.style.width=A.getWidth()+'px'; -return B;}return false;},getTargetFromEvent:function(e,A){var B=e.getTarget();while((B!==null)&&(B.parentNode!=this.containerEl.dom)){B=B.parentNode;}var C={position:'',cards:[],card_n:-1,items_n:-1,card:false};var D=false;var E=0;var F=0;for(var i=0;i0?'below':D;C.items_n=i>0?i-1:0;C.card_n=F>0?F-1:0;C.card=C.cards[C.card_n]; -}}if(!C.cards.length){C.card=true;C.position='below';C.items_n;return C;}if(C.card_n<0){C.card_n=E;C.card=C.cards[E];C.items_n=this.items.indexOf(C.cards[E]);C.position='below';}if(this.items[C.items_n].el==A){return false;}if(C.position=='below'){var G=C.card_n+1==C.cards.length?false:C.cards[C.card_n+1]; -if(G&&G.el==A){return false;}return C;}var H=C.card_n>0?C.cards[C.card_n-1]:false;if(H&&H.el==A){return false;}return C;},onNodeEnter:function(n,dd,e,A){return false;},onNodeOver:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);if(B===false){this.dropPlaceHolder('hide'); +this.header_imageEl.on('load',this.onHeaderImageLoad,this);},getDragData:function(e){var A=this.getEl();if(A){var B={source:this,copy:false,nodes:this.getEl(),records:[]};B.ddel=A.dom;Roo.log(A.getWidth());B.ddel.style.width=A.getWidth()+'px';return B;}return false; +},getTargetFromEvent:function(e,A){var B=e.getTarget();while((B!==null)&&(B.parentNode!=this.containerEl.dom)){B=B.parentNode;}var C={position:'',cards:[],card_n:-1,items_n:-1,card:false};var D=false;var E=0;var F=0;for(var i=0;i0?'below':D;C.items_n=i>0?i-1:0;C.card_n=F>0?F-1:0;C.card=C.cards[C.card_n];}}if(!C.cards.length){C.card=true;C.position='below'; +C.items_n;return C;}if(C.card_n<0){C.card_n=E;C.card=C.cards[E];C.items_n=this.items.indexOf(C.cards[E]);C.position='below';}if(this.items[C.items_n].el==A){return false;}if(C.position=='below'){var G=C.card_n+1==C.cards.length?false:C.cards[C.card_n+1];if(G&&G.el==A){return false; +}return C;}var H=C.card_n>0?C.cards[C.card_n-1]:false;if(H&&H.el==A){return false;}return C;},onNodeEnter:function(n,dd,e,A){return false;},onNodeOver:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);if(B===false){this.dropPlaceHolder('hide'); return false;}Roo.log(['getTargetFromEvent',B]);this.dropPlaceHolder('show',B,A);return false;},onNodeOut:function(n,dd,e,A){this.dropPlaceHolder('hide');},onNodeDrop:function(n,dd,e,A){var B=this.getTargetFromEvent(e,A.source.el);if(B===false){return false; }this.dropPlaceHolder('hide');this.acceptCard(A.source,B.position,B.card,B.items_n);return true;},firstChildCard:function(){for(var i=0;i