examples/bootstrap4/popover.html

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 85f9c9f..92cdce6 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -19877,6 +19877,8 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
             
         }
         
+        this.alignEl = on_el;
+
         if (!this.el) {
             this.render(document.body);
         }
@@ -19892,10 +19894,9 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
         this.el.show();
         this.el.dom.style.display = 'block';
          
-        
  
-        if (on_el) {
-            this.updatePosition(placement);
+        if (this.alignEl) {
+            this.updatePosition(this.placement, true);
              
         } else {
             // this is usually just done by the builder = to show the popoup in the middle of the scren.
@@ -19929,16 +19930,20 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
     },
     /**
      * fire this manually after loading a grid in the table for example
-     * @param {string} (left|right|top|bottom) where to try and put it
+     * @param {string} (left|right|top|bottom) where to try and put it (use false to use the last one)
      * @param {Boolean} try and move it if we cant get right position.
      */
     updatePosition : function(placement, try_move)
     {
+        // allow for calling with no parameters
+        placement = placement   ? placement :  this.placement;
+        try_move = typeof(try_move) == 'undefined' ? true : try_move;
+        
         this.el.removeClass([
             'fade','top','bottom', 'left', 'right','in',
             'bs-popover-top','bs-popover-bottom', 'bs-popover-left', 'bs-popover-right'
         ]);
-        this.el.addClass(placement + ' roo-popover-' + placement);
+        this.el.addClass(placement + ' bs-popover-' + placement);
         
         if (!this.alignEl ) {
             return false;
@@ -19950,14 +19955,14 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                 var offset = this.el.getAlignToXY(this.alignEl, 'tl-tr?',[10,0]);
                 if (!try_move || exact.equals(offset) || exact[0] == offset[0] ) {
                     //normal display... or moved up/down.
-                    this.setXY(offset);
+                    this.el.setXY(offset);
                     var xy = this.alignEl.getAnchorXY('tr', false);
                     xy[0]+=2;xy[1]+=5;
                     this.arrowEl.setXY(xy);
                     return true;
                 }
                 // continue through...
-                try_move = false;
+                return this.updatePosition('left', false);
                 
             
             case 'left':
@@ -19965,9 +19970,9 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                 var offset = this.el.getAlignToXY(this.alignEl, 'tr-tl?',[-10,0]);
                 if (!try_move || exact.equals(offset) || exact[0] == offset[0] ) {
                     //normal display... or moved up/down.
-                    this.setXY(offset);
+                    this.el.setXY(offset);
                     var xy = this.alignEl.getAnchorXY('tl', false);
-                    xy[0]+=2;xy[1]+=5; // << fix me
+                    xy[0]-=10;xy[1]+=5; // << fix me
                     this.arrowEl.setXY(xy);
                     return true;
                 }
@@ -19975,27 +19980,27 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                 return this.updatePosition('right', false);
             
             case 'top':
-                var exact = this.el.getAlignToXY(this.alignEl, 't-b', [0,-10]);
-                var offset = this.el.getAlignToXY(this.alignEl, 't-b?',[0,-10]);
+                var exact = this.el.getAlignToXY(this.alignEl, 'b-t', [0,-10]);
+                var offset = this.el.getAlignToXY(this.alignEl, 'b-t?',[0,-10]);
                 if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) {
                     //normal display... or moved up/down.
-                    this.setXY(offset);
-                    var xy = this.alignEl.getAnchorXY('b', false);
-                    xy[0]+=2;xy[1]+=5; // << fix me
+                    this.el.setXY(offset);
+                    var xy = this.alignEl.getAnchorXY('t', false);
+                    xy[1]-=10; // << fix me
                     this.arrowEl.setXY(xy);
                     return true;
                 }
                 // fall through
-                try_move = false;
+               return this.updatePosition('bottom', false);
             
             case 'bottom':
-                 var exact = this.el.getAlignToXY(this.alignEl, 'b-t', [0,10]);
-                var offset = this.el.getAlignToXY(this.alignEl, 'b-t?',[0,10]);
+                 var exact = this.el.getAlignToXY(this.alignEl, 't-b', [0,10]);
+                var offset = this.el.getAlignToXY(this.alignEl, 't-b?',[0,10]);
                 if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) {
                     //normal display... or moved up/down.
-                    this.setXY(offset);
-                    var xy = this.alignEl.getAnchorXY('t', false);
-                    xy[0]+=2;xy[1]+=5; // << fix me
+                    this.el.setXY(offset);
+                    var xy = this.alignEl.getAnchorXY('b', false);
+                     xy[1]+=2; // << fix me
                     this.arrowEl.setXY(xy);
                     return true;
                 }