From: Alan Knowles Date: Wed, 28 Nov 2018 09:43:48 +0000 (+0800) Subject: sync X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=ebf67dffd5db1f8352b7e6fb78a62193fb8d781f;p=roojs1 sync --- diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index 320c178508..4d1e57516d 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -76,11 +76,11 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { cn : [ { tag: 'h3', - cls: 'popover-title', + cls: 'popover-title popover-header', html : this.title }, { - cls : 'popover-content', + cls : 'popover-content popover-body', html : this.html } ] @@ -205,7 +205,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { if (this.html !== false) { this.el.select('.popover-content',true).first().dom.innerHtml = this.html; } - this.el.removeClass(['fade','top','bottom', 'left', 'right','in']); + this.el.removeClass(['fade','top','bottom', 'left', 'right','in', 'bs-popover-top','bs-popover-bottom', 'bs-popover-left', 'bs-popover-right',]); if (!this.title.length) { this.el.select('.popover-title',true).hide(); } @@ -266,10 +266,10 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { }); Roo.bootstrap.Popover.alignment = { - 'left' : ['r-l', [-10,0], 'right'], - 'right' : ['l-r', [10,0], 'left'], - 'bottom' : ['t-b', [0,10], 'top'], - 'top' : [ 'b-t', [0,-10], 'bottom'] + 'left' : ['r-l', [-10,0], 'right bs-popover-right'], + 'right' : ['l-r', [10,0], 'left bs-popover-left'], + 'bottom' : ['t-b', [0,10], 'top bs-popover-top'], + 'top' : [ 'b-t', [0,-10], 'bottom bs-popover-bottom'] }; \ No newline at end of file