roojs-bootstrap.js

roojs-bootstrap-debug.js
Roo/bootstrap/Card.js

diff --git a/Roo/bootstrap/Card.js b/Roo/bootstrap/Card.js
index b97f7a9..6fb4f6a 100644 (file)
--- a/Roo/bootstrap/Card.js
+++ b/Roo/bootstrap/Card.js
@@ -521,7 +521,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
            this.cardel.parentNode.insertBefore(this.dropEl, cardel);
        } else if (cardel.nextSibling) {
            this.cardel.parentNode.insertBefore(this.dropEl,ns);
-       } else
+       } else {
            this.cardel.parentNode.append(this.dropEl);
        }
        this.cardel.style.width = "100%";

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index bd295ac..82ddf4c 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -2391,7 +2391,17 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
            return;
        }
        var cardel = where_ar[0].el.dom;
-       var dropEl
+       
+       this.dropEl.parentNode.removeChild(this.dropEl);
+       if (where_ar[0] == 'before') {
+           this.cardel.parentNode.insertBefore(this.dropEl, cardel);
+       } else if (cardel.nextSibling) {
+           this.cardel.parentNode.insertBefore(this.dropEl,ns);
+       } else
+           this.cardel.parentNode.append(this.dropEl);
+       }
+       this.cardel.style.width = "100%";
+       this.cardel.style.height = Roo.get(data.ddel).getHeight() + 'px';
        
        
        

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 1d9ab90..7b2f9fd 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -98,7 +98,8 @@ if(pt=="below"){B++;}for(var i=0;i<this.items.length;i++){var r=this.items[i];if
 this.store.insert(B++,r);}this.isDirtyFlag=true;}}this.dragZone.cachedTarget=null;return true;},getDropPoint:function(e,n,dd){if(dd){return false;}if(n==this.bodyEl.dom){return "above";}var t=Roo.lib.Dom.getY(n),b=t+n.offsetHeight;var c=t+(b-t)/2;var y=Roo.lib.Event.getPageY(e);
 if(y<=c){return "above";}else{return "below";}},onToggleCollapse:function(e){if(this.collapsed){this.el.select('.roo-collapse-toggle').removeClass('collapsed');this.el.select('.roo-collapsable').addClass('show');this.collapsed=false;return;}this.el.select('.roo-collapse-toggle').addClass('collapsed');
 this.el.select('.roo-collapsable').removeClass('show');this.collapsed=true;},dropPlaceHolder:function(A,B,C){if(this.dropEl===false){this.dropEl=new Roo.DomHelper.append(this.dom.bodyEl,{cls:'d-none'});}if(A=='hide'){this.dropEl.removeClass(['d-none','d-block']);
-this.dropEl.addClass('d-none');return;}var D=B[0].el.dom;var E}});
+this.dropEl.addClass('d-none');return;}var D=B[0].el.dom;this.dropEl.parentNode.removeChild(this.dropEl);if(B[0]=='before'){this.cardel.parentNode.insertBefore(this.dropEl,D);}else if(D.nextSibling){this.cardel.parentNode.insertBefore(this.dropEl,ns);}elsethis.cardel.parentNode.append(this.dropEl);
+}this.cardel.style.width="100%";this.cardel.style.height=Roo.get(data.ddel).getHeight()+'px';}});
 // Roo/bootstrap/CardHeader.js
 Roo.bootstrap.CardHeader=function(A){Roo.bootstrap.CardHeader.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.CardHeader,Roo.bootstrap.Element,{container_method:'getCardHeader'});
 // Roo/bootstrap/CardImageTop.js