From: Alan Knowles Date: Wed, 31 Mar 2021 10:00:00 +0000 (+0800) Subject: compile X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=refs%2Fheads%2Fwip_alan_T6662_support_header_image_in_square compile --- diff --git a/docs/src/Roo_bootstrap_Card.js.html b/docs/src/Roo_bootstrap_Card.js.html index c37615276f..2aa75bad5b 100644 --- a/docs/src/Roo_bootstrap_Card.js.html +++ b/docs/src/Roo_bootstrap_Card.js.html @@ -140,6 +140,7 @@ bodyEl: false, // card-body headerContainerEl : false, // headerEl : false, + header_imageEl : false, layoutCls : function() { @@ -350,7 +351,7 @@ }, 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 @@ 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) @@ -748,6 +751,27 @@ if (this.headerContainerEl) { this.headerContainerEl.dom.innerHTML = html; } + }, + onHeaderImageLoad : function(ev, he) + { + if (!this.header_image_fit_square) { + return; + } + + var hw = he.naturalHeight / he.naturalWidth; + // wide image = < 0 + // tall image = > 1 + //var w = he.dom.naturalWidth; + var ww = he.width; + he.style.left = 0; + he.style.position = 'relative'; + if (hw > 1) { + var nw = (ww * (1/hw)); + Roo.get(he).setSize( ww * (1/hw), ww); + he.style.left = ((ww - nw)/ 2) + 'px'; + he.style.position = 'relative'; + } + } diff --git a/docs/src/Roo_grid_GridView.js.html b/docs/src/Roo_grid_GridView.js.html index 87b5c7197a..dbc0949af6 100644 --- a/docs/src/Roo_grid_GridView.js.html +++ b/docs/src/Roo_grid_GridView.js.html @@ -598,7 +598,7 @@ ); */ 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"); diff --git a/roojs-debug.js b/roojs-debug.js index d0b21744ed..dc2cfc3056 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -56779,7 +56779,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"); diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index c20c019ab9..1d30256a64 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -33771,7 +33771,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");