From: Alan Knowles Date: Wed, 31 Mar 2021 09:39:21 +0000 (+0800) Subject: Changed Roo/bootstrap/Card.jsRoo/grid/GridView.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=15a8757f17b22a2584f00f17ccdb9b4a7894cc2d Changed Roo/bootstrap/Card.jsRoo/grid/GridView.js --- diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js index 47c575abbb..2bbe1dafb6 100644 --- a/Roo/bootstrap/Card.js +++ b/Roo/bootstrap/Card.js @@ -140,6 +140,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { bodyEl: false, // card-body headerContainerEl : false, // headerEl : false, + header_imageEl : false, layoutCls : function() { @@ -350,7 +351,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { }, getCardImageTop : function() { - var ret = this.el.select('.card-img-top',true).first(); + var ret = this.header_imageEl; if (ret.hasClass('d-none')) { ret.removeClass('d-none'); } @@ -407,6 +408,8 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component, { 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); }, getDragData : function(e) diff --git a/Roo/grid/GridView.js b/Roo/grid/GridView.js index 28586850d9..20e4d3adb3 100644 --- a/Roo/grid/GridView.js +++ b/Roo/grid/GridView.js @@ -598,7 +598,7 @@ Roo.extend(Roo.grid.GridView, Roo.grid.AbstractGridView, { ); */ if(ctop < stop){ - c.scrollTop = ctop; + c.scrollTop = ctop; //Roo.log("set scrolltop to ctop DISABLE?"); }else if(cbot > sbot){ //Roo.log("set scrolltop to cbot-ch");