Merge pull request #271 in FUI/fineui from ~WINDY/fui:master to master

* commit 'dd97569034355fb740c345b4fb9a928e066a64ac':
  bubble还原

dist/base.css

@@ -1552,9 +1552,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   color: #faaa39;
 }
 
+.bi-tip {
+  position: fixed !important;
+}
 
 .bi-toast {
-  position: fixed !important;
   font-size: 14px;
   color: #ffffff;
   max-width: 400px;
@@ -1580,7 +1582,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }
 
 .bi-tooltip {
-  position: fixed !important;
   max-width: 250px;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

dist/bundle.css

@@ -3599,9 +3599,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   color: #faaa39;
 }
 
+.bi-tip {
+  position: fixed !important;
+}
 
 .bi-toast {
-  position: fixed !important;
   font-size: 14px;
   color: #ffffff;
   max-width: 400px;
@@ -3627,7 +3629,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }
 
 .bi-tooltip {
-  position: fixed !important;
   max-width: 250px;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

dist/bundle.js

@@ -26164,8 +26164,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
 
     _init: function () {
         BI.BubblesController.superclass._init.apply(this, arguments);
+        var self = this;
         this.bubblesManager = {};
         this.storeBubbles = {};
+        BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
+            BI.each(self.bubblesManager, function (name) {
+                self.remove(name);
+            });
+            self.bubblesManager = {};
+            self.storeBubbles = {};
+        });
     },
 
     _createBubble: function (direct, text, level, height) {
@@ -26181,60 +26189,60 @@ BI.BubblesController = BI.inherit(BI.Controller, {
     _getOffsetLeft: function (name, context, offsetStyle) {
         var left = 0;
         if ("center" === offsetStyle) {
-            left = (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
+            left = context.element.offset().left + (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
         if ("right" === offsetStyle) {
-            left = context.element.bounds().width - this.get(name).element.bounds().width;
+            left = context.element.offset().left + context.element.bounds().width - this.get(name).element.bounds().width;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
-        return left;
+        return context.element.offset().left;
     },
 
     _getOffsetTop: function (name, context, offsetStyle) {
         var top = 0;
         if ("center" === offsetStyle) {
-            top = (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
+            top = context.element.offset().top + (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
             if (top < 0) {
                 top = 0;
             }
             return top;
         } else if ("right" === offsetStyle) {
-            top = context.element.bounds().height - this.get(name).element.bounds().height;
+            top = context.element.offset().top + context.element.bounds().height - this.get(name).element.bounds().height;
             if (top < 0) {
                 top = 0;
             }
             return top;
         }
-        return top;
+        return context.element.offset().top;
     },
 
     _getLeftPosition: function (name, context, offsetStyle) {
-        var position = {left: - this.get(name).element.bounds().width};
+        var position = $.getLeftPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },
 
     _getBottomPosition: function (name, context, offsetStyle) {
-        var position = {top: context.element.bounds().height};
+        var position = $.getBottomPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getTopPosition: function (name, context, offsetStyle) {
-        var position = {top: -35};
+        var position = $.getTopPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getRightPosition: function (name, context, offsetStyle) {
-        var position = {left: context.element.bounds().width};
+        var position = $.getRightPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },

dist/core.js

@@ -26164,8 +26164,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
 
     _init: function () {
         BI.BubblesController.superclass._init.apply(this, arguments);
+        var self = this;
         this.bubblesManager = {};
         this.storeBubbles = {};
+        BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
+            BI.each(self.bubblesManager, function (name) {
+                self.remove(name);
+            });
+            self.bubblesManager = {};
+            self.storeBubbles = {};
+        });
     },
 
     _createBubble: function (direct, text, level, height) {
@@ -26181,60 +26189,60 @@ BI.BubblesController = BI.inherit(BI.Controller, {
     _getOffsetLeft: function (name, context, offsetStyle) {
         var left = 0;
         if ("center" === offsetStyle) {
-            left = (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
+            left = context.element.offset().left + (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
         if ("right" === offsetStyle) {
-            left = context.element.bounds().width - this.get(name).element.bounds().width;
+            left = context.element.offset().left + context.element.bounds().width - this.get(name).element.bounds().width;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
-        return left;
+        return context.element.offset().left;
     },
 
     _getOffsetTop: function (name, context, offsetStyle) {
         var top = 0;
         if ("center" === offsetStyle) {
-            top = (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
+            top = context.element.offset().top + (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
             if (top < 0) {
                 top = 0;
             }
             return top;
         } else if ("right" === offsetStyle) {
-            top = context.element.bounds().height - this.get(name).element.bounds().height;
+            top = context.element.offset().top + context.element.bounds().height - this.get(name).element.bounds().height;
             if (top < 0) {
                 top = 0;
             }
             return top;
         }
-        return top;
+        return context.element.offset().top;
     },
 
     _getLeftPosition: function (name, context, offsetStyle) {
-        var position = {left: - this.get(name).element.bounds().width};
+        var position = $.getLeftPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },
 
     _getBottomPosition: function (name, context, offsetStyle) {
-        var position = {top: context.element.bounds().height};
+        var position = $.getBottomPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getTopPosition: function (name, context, offsetStyle) {
-        var position = {top: -35};
+        var position = $.getTopPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getRightPosition: function (name, context, offsetStyle) {
-        var position = {left: context.element.bounds().width};
+        var position = $.getRightPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },

dist/fineui.css

@@ -3599,9 +3599,11 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
   color: #faaa39;
 }
 
+.bi-tip {
+  position: fixed !important;
+}
 
 .bi-toast {
-  position: fixed !important;
   font-size: 14px;
   color: #ffffff;
   max-width: 400px;
@@ -3627,7 +3629,6 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 }
 
 .bi-tooltip {
-  position: fixed !important;
   max-width: 250px;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

dist/fineui.js

@@ -26407,8 +26407,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
 
     _init: function () {
         BI.BubblesController.superclass._init.apply(this, arguments);
+        var self = this;
         this.bubblesManager = {};
         this.storeBubbles = {};
+        BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
+            BI.each(self.bubblesManager, function (name) {
+                self.remove(name);
+            });
+            self.bubblesManager = {};
+            self.storeBubbles = {};
+        });
     },
 
     _createBubble: function (direct, text, level, height) {
@@ -26424,60 +26432,60 @@ BI.BubblesController = BI.inherit(BI.Controller, {
     _getOffsetLeft: function (name, context, offsetStyle) {
         var left = 0;
         if ("center" === offsetStyle) {
-            left = (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
+            left = context.element.offset().left + (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
         if ("right" === offsetStyle) {
-            left = context.element.bounds().width - this.get(name).element.bounds().width;
+            left = context.element.offset().left + context.element.bounds().width - this.get(name).element.bounds().width;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
-        return left;
+        return context.element.offset().left;
     },
 
     _getOffsetTop: function (name, context, offsetStyle) {
         var top = 0;
         if ("center" === offsetStyle) {
-            top = (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
+            top = context.element.offset().top + (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
             if (top < 0) {
                 top = 0;
             }
             return top;
         } else if ("right" === offsetStyle) {
-            top = context.element.bounds().height - this.get(name).element.bounds().height;
+            top = context.element.offset().top + context.element.bounds().height - this.get(name).element.bounds().height;
             if (top < 0) {
                 top = 0;
             }
             return top;
         }
-        return top;
+        return context.element.offset().top;
     },
 
     _getLeftPosition: function (name, context, offsetStyle) {
-        var position = {left: - this.get(name).element.bounds().width};
+        var position = $.getLeftPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },
 
     _getBottomPosition: function (name, context, offsetStyle) {
-        var position = {top: context.element.bounds().height};
+        var position = $.getBottomPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getTopPosition: function (name, context, offsetStyle) {
-        var position = {top: -35};
+        var position = $.getTopPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getRightPosition: function (name, context, offsetStyle) {
-        var position = {left: context.element.bounds().width};
+        var position = $.getRightPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },

src/core/controller/controller.bubbles.js

@@ -16,8 +16,16 @@ BI.BubblesController = BI.inherit(BI.Controller, {
 
     _init: function () {
         BI.BubblesController.superclass._init.apply(this, arguments);
+        var self = this;
         this.bubblesManager = {};
         this.storeBubbles = {};
+        BI.Resizers.add("bubbleController" + BI.uniqueId(), function () {
+            BI.each(self.bubblesManager, function (name) {
+                self.remove(name);
+            });
+            self.bubblesManager = {};
+            self.storeBubbles = {};
+        });
     },
 
     _createBubble: function (direct, text, level, height) {
@@ -33,60 +41,60 @@ BI.BubblesController = BI.inherit(BI.Controller, {
     _getOffsetLeft: function (name, context, offsetStyle) {
         var left = 0;
         if ("center" === offsetStyle) {
-            left = (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
+            left = context.element.offset().left + (context.element.bounds().width - this.get(name).element.bounds().width) / 2;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
         if ("right" === offsetStyle) {
-            left = context.element.bounds().width - this.get(name).element.bounds().width;
+            left = context.element.offset().left + context.element.bounds().width - this.get(name).element.bounds().width;
             if (left < 0) {
                 left = 0;
             }
             return left;
         }
-        return left;
+        return context.element.offset().left;
     },
 
     _getOffsetTop: function (name, context, offsetStyle) {
         var top = 0;
         if ("center" === offsetStyle) {
-            top = (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
+            top = context.element.offset().top + (context.element.bounds().height - this.get(name).element.bounds().height) / 2;
             if (top < 0) {
                 top = 0;
             }
             return top;
         } else if ("right" === offsetStyle) {
-            top = context.element.bounds().height - this.get(name).element.bounds().height;
+            top = context.element.offset().top + context.element.bounds().height - this.get(name).element.bounds().height;
             if (top < 0) {
                 top = 0;
             }
             return top;
         }
-        return top;
+        return context.element.offset().top;
     },
 
     _getLeftPosition: function (name, context, offsetStyle) {
-        var position = {left: - this.get(name).element.bounds().width};
+        var position = $.getLeftPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },
 
     _getBottomPosition: function (name, context, offsetStyle) {
-        var position = {top: context.element.bounds().height};
+        var position = $.getBottomPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getTopPosition: function (name, context, offsetStyle) {
-        var position = {top: -35};
+        var position = $.getTopPosition(context, this.get(name));
         position.left = this._getOffsetLeft(name, context, offsetStyle);
         return position;
     },
 
     _getRightPosition: function (name, context, offsetStyle) {
-        var position = {left: context.element.bounds().width};
+        var position = $.getRightPosition(context, this.get(name));
         position.top = this._getOffsetTop(name, context, offsetStyle);
         return position;
     },

src/css/base/single/tip/tip.css

@@ -23,9 +23,11 @@
   color: #faaa39;
 }
 
+.bi-tip {
+  position: fixed !important;
+}
 
 .bi-toast {
-  position: fixed !important;
   font-size: 14px;
   color: #ffffff;
   max-width: 400px;
@@ -51,7 +53,6 @@
 }
 
 .bi-tooltip {
-  position: fixed !important;
   max-width: 250px;
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;

src/less/base/single/tip/tip.less

@@ -2,5 +2,5 @@
 
 
 .bi-tip{
-
+  position: fixed !important;
 }

src/less/base/single/tip/tip.toast.less

@@ -1,7 +1,6 @@
 @import "../../../index";
 
 .bi-toast{
-  position: fixed !important;
   font-size: @font-size-14;
   color: @color-bi-text;
   max-width: 400px;

src/less/base/single/tip/tip.tooltip.less

@@ -1,7 +1,6 @@
 @import "../../../index";
 
 .bi-tooltip{
-  position: fixed !important;
   max-width: 250px;
   .border-radius(2px);
   font-size: 12px;