examples/bootstrap4/popover.html

[roojs1] / roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index f7091fd..92cdce6 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -19935,13 +19935,15 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
      */
     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;
@@ -19960,7 +19962,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                     return true;
                 }
                 // continue through...
-                try_move = false;
+                return this.updatePosition('left', false);
                 
             
             case 'left':
@@ -19970,7 +19972,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                     //normal display... or moved up/down.
                     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;
                 }
@@ -19983,13 +19985,13 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                 if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) {
                     //normal display... or moved up/down.
                     this.el.setXY(offset);
-                    var xy = this.alignEl.getAnchorXY('b', false);
-                    xy[0]+=2;xy[1]+=5; // << fix me
+                    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, 't-b', [0,10]);
@@ -19997,8 +19999,8 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component,  {
                 if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) {
                     //normal display... or moved up/down.
                     this.el.setXY(offset);
-                    var xy = this.alignEl.getAnchorXY('t', false);
-                    xy[0]+=2;xy[1]+=5; // << fix me
+                    var xy = this.alignEl.getAnchorXY('b', false);
+                     xy[1]+=2; // << fix me
                     this.arrowEl.setXY(xy);
                     return true;
                 }