Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fui

dist/base.js

@@ -15328,31 +15328,30 @@ BI.Popover = BI.inherit(BI.Widget, {
     },
     render: function () {
         var self = this, o = this.options;
-        this.element.draggable && this.element.draggable({
+        this.startX = 0;
-            handle: ".bi-message-title",
+        this.startY = 0;
-            drag: function (e, ui) {
+        this.tracker = new BI.MouseMoveTracker(function (deltaX, deltaY) {
+            var size = self._calculateSize();
             var W = $("body").width(), H = $("body").height();
-                if (ui.position.left + o.width > W) {
+            self.startX += deltaX;
-                    ui.position.left = W - o.width;
+            self.startY += deltaY;
-                }
+            self.element.css({
-                if (ui.position.top + o.height > H) {
+                left: BI.clamp(self.startX, 0, W - size.width) + "px",
-                    ui.position.top = H - o.height;
+                top: BI.clamp(self.startY, 0, H - size.height) + "px"
-                }
+            });
-                if (ui.position.left < 0) {
-                    ui.position.left = 0;
-                }
-                if (ui.position.top < 0) {
-                    ui.position.top = 0;
-                }
             // BI-12134 没有什么特别好的方法
             BI.Resizers._resize();
-            }
+        }, function () {
-        });
+            self.tracker.releaseMouseMoves();
+        }, window);
         var items = {
             north: {
                 el: {
                     type: "bi.border",
                     cls: "bi-message-title bi-background",
+                    ref: function (_ref) {
+                        self.dragger = _ref;
+                    },
                     items: {
                         center: {
                             el: {
@@ -15425,6 +15424,16 @@ BI.Popover = BI.inherit(BI.Widget, {
         };
     },
 
+    mounted: function () {
+        var self = this;
+        this.dragger.element.mousedown(function (e) {
+            var pos = self.element.offset();
+            self.startX = pos.left;
+            self.startY = pos.top;
+            self.tracker.captureMouseMoves(e);
+        });
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

dist/bundle.js

@@ -50814,31 +50814,30 @@ BI.Popover = BI.inherit(BI.Widget, {
     },
     render: function () {
         var self = this, o = this.options;
-        this.element.draggable && this.element.draggable({
+        this.startX = 0;
-            handle: ".bi-message-title",
+        this.startY = 0;
-            drag: function (e, ui) {
+        this.tracker = new BI.MouseMoveTracker(function (deltaX, deltaY) {
+            var size = self._calculateSize();
             var W = $("body").width(), H = $("body").height();
-                if (ui.position.left + o.width > W) {
+            self.startX += deltaX;
-                    ui.position.left = W - o.width;
+            self.startY += deltaY;
-                }
+            self.element.css({
-                if (ui.position.top + o.height > H) {
+                left: BI.clamp(self.startX, 0, W - size.width) + "px",
-                    ui.position.top = H - o.height;
+                top: BI.clamp(self.startY, 0, H - size.height) + "px"
-                }
+            });
-                if (ui.position.left < 0) {
-                    ui.position.left = 0;
-                }
-                if (ui.position.top < 0) {
-                    ui.position.top = 0;
-                }
             // BI-12134 没有什么特别好的方法
             BI.Resizers._resize();
-            }
+        }, function () {
-        });
+            self.tracker.releaseMouseMoves();
+        }, window);
         var items = {
             north: {
                 el: {
                     type: "bi.border",
                     cls: "bi-message-title bi-background",
+                    ref: function (_ref) {
+                        self.dragger = _ref;
+                    },
                     items: {
                         center: {
                             el: {
@@ -50911,6 +50910,16 @@ BI.Popover = BI.inherit(BI.Widget, {
         };
     },
 
+    mounted: function () {
+        var self = this;
+        this.dragger.element.mousedown(function (e) {
+            var pos = self.element.offset();
+            self.startX = pos.left;
+            self.startY = pos.top;
+            self.tracker.captureMouseMoves(e);
+        });
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};
@@ -93839,7 +93848,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -106712,7 +106721,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -107023,7 +107032,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -107288,7 +107297,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;

dist/widget.js

@@ -7279,7 +7279,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -20152,7 +20152,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -20463,7 +20463,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;
@@ -20728,7 +20728,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;

src/base/layer/layer.popover.js

@@ -25,31 +25,30 @@ BI.Popover = BI.inherit(BI.Widget, {
     },
     render: function () {
         var self = this, o = this.options;
-        this.element.draggable && this.element.draggable({
+        this.startX = 0;
-            handle: ".bi-message-title",
+        this.startY = 0;
-            drag: function (e, ui) {
+        this.tracker = new BI.MouseMoveTracker(function (deltaX, deltaY) {
+            var size = self._calculateSize();
             var W = $("body").width(), H = $("body").height();
-                if (ui.position.left + o.width > W) {
+            self.startX += deltaX;
-                    ui.position.left = W - o.width;
+            self.startY += deltaY;
-                }
+            self.element.css({
-                if (ui.position.top + o.height > H) {
+                left: BI.clamp(self.startX, 0, W - size.width) + "px",
-                    ui.position.top = H - o.height;
+                top: BI.clamp(self.startY, 0, H - size.height) + "px"
-                }
+            });
-                if (ui.position.left < 0) {
-                    ui.position.left = 0;
-                }
-                if (ui.position.top < 0) {
-                    ui.position.top = 0;
-                }
             // BI-12134 没有什么特别好的方法
             BI.Resizers._resize();
-            }
+        }, function () {
-        });
+            self.tracker.releaseMouseMoves();
+        }, window);
         var items = {
             north: {
                 el: {
                     type: "bi.border",
                     cls: "bi-message-title bi-background",
+                    ref: function (_ref) {
+                        self.dragger = _ref;
+                    },
                     items: {
                         center: {
                             el: {
@@ -122,6 +121,16 @@ BI.Popover = BI.inherit(BI.Widget, {
         };
     },
 
+    mounted: function () {
+        var self = this;
+        this.dragger.element.mousedown(function (e) {
+            var pos = self.element.offset();
+            self.startX = pos.left;
+            self.startY = pos.top;
+            self.tracker.captureMouseMoves(e);
+        });
+    },
+
     _calculateSize: function () {
         var o = this.options;
         var size = {};

src/widget/intervalslider/intervalslider.js

@@ -189,7 +189,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;

src/widget/singleslider/singleslider.js

@@ -176,7 +176,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;

src/widget/singleslider/singleslider.label.js

@@ -158,7 +158,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;

src/widget/singleslider/singleslider.normal.js

@@ -123,7 +123,7 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
             widget.element.removeClass("dragging");
             mouseMoveTracker.releaseMouseMoves();
             self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
-        }, document);
+        }, window);
         widget.element.on("mousedown", function (event) {
             if(!widget.isEnabled()) {
                 return;