From 0b48d011155f7c8cfb6b89e1baf99752b5736745 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 28 Jun 2018 16:48:11 +0800 Subject: [PATCH] update --- dist/base.js | 2 +- dist/bundle.css | 8 ++++ dist/bundle.js | 38 ++----------------- dist/fineui.css | 8 ++++ dist/fineui.js | 38 ++----------------- dist/widget.css | 8 ++++ dist/widget.js | 36 +----------------- src/base/layer/layer.popup.js | 2 +- src/css/widget/singleslider/slider/widget.css | 8 ++++ .../singleslider/slider/widget.slider.less | 8 ++++ .../singleslider/button/iconbutton.slider.js | 36 +----------------- 11 files changed, 52 insertions(+), 140 deletions(-) diff --git a/dist/base.js b/dist/base.js index 4ed7df4c2..288e2c764 100644 --- a/dist/base.js +++ b/dist/base.js @@ -15608,7 +15608,7 @@ BI.PopupView = BI.inherit(BI.Widget, { BI.PopupView.superclass._init.apply(this, arguments); var self = this, o = this.options; var fn = function (e) { - e.stopEvent(); + e.stopPropagation(); }, stop = function (e) { e.stopEvent(); return false; diff --git a/dist/bundle.css b/dist/bundle.css index 619b6de63..da2c4e686 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -4122,12 +4122,20 @@ ul.ztree.zTreeDragUL { -moz-border-radius: 8px; border-radius: 8px; background-color: #ffffff; + height: 16px; + width: 16px; + top: 6px; + left: -8px; } .bi-single-slider-button .slider-button:hover, .bi-single-slider-button .slider-button.hover { -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; + width: 20px; + height: 20px; + top: 4px; + left: -10px; } .bi-slider-track .gray-track { background-color: #F2F4F7; diff --git a/dist/bundle.js b/dist/bundle.js index bb5ef708f..a64e98f45 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -51379,7 +51379,7 @@ BI.PopupView = BI.inherit(BI.Widget, { BI.PopupView.superclass._init.apply(this, arguments); var self = this, o = this.options; var fn = function (e) { - e.stopEvent(); + e.stopPropagation(); }, stop = function (e) { e.stopEvent(); return false; @@ -108546,44 +108546,12 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", cls: "slider-button", - height: this.constants.NORMAL_SIZE, - width: this.constants.NORMAL_SIZE, ref: function () { self.slider = this; } - }, - top: this.constants.NORMAL_OFFSET, - left: -8 - }], - width: 0, - height: this.constants.NORMAL_SIZE + } + }] }; - }, - - mounted: function () { - var self = this; - this.slider.element.hover(function () { - self._enlarge(); - }, function () { - self._normalize(); - }); - }, - - - _enlarge: function () { - this.slider.setWidth(this.constants.LARGE_SIZE); - this.slider.setHeight(this.constants.LARGE_SIZE); - this.wrapper.attr("items")[0].top = this.constants.LARGE_OFFSET; - this.wrapper.attr("items")[0].left = -10; - this.wrapper.resize(); - }, - - _normalize: function () { - this.slider.setWidth(this.constants.NORMAL_SIZE); - this.slider.setHeight(this.constants.NORMAL_SIZE); - this.wrapper.attr("items")[0].top = this.constants.NORMAL_OFFSET; - this.wrapper.attr("items")[0].left = -8; - this.wrapper.resize(); } }); BI.shortcut("bi.single_slider_button", BI.SliderIconButton);/** diff --git a/dist/fineui.css b/dist/fineui.css index 268fef8d8..f88abf162 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -4122,12 +4122,20 @@ ul.ztree.zTreeDragUL { -moz-border-radius: 8px; border-radius: 8px; background-color: #ffffff; + height: 16px; + width: 16px; + top: 6px; + left: -8px; } .bi-single-slider-button .slider-button:hover, .bi-single-slider-button .slider-button.hover { -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; + width: 20px; + height: 20px; + top: 4px; + left: -10px; } .bi-slider-track .gray-track { background-color: #F2F4F7; diff --git a/dist/fineui.js b/dist/fineui.js index e1b7659cf..4bc1ef8c8 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -51628,7 +51628,7 @@ BI.PopupView = BI.inherit(BI.Widget, { BI.PopupView.superclass._init.apply(this, arguments); var self = this, o = this.options; var fn = function (e) { - e.stopEvent(); + e.stopPropagation(); }, stop = function (e) { e.stopEvent(); return false; @@ -108795,44 +108795,12 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", cls: "slider-button", - height: this.constants.NORMAL_SIZE, - width: this.constants.NORMAL_SIZE, ref: function () { self.slider = this; } - }, - top: this.constants.NORMAL_OFFSET, - left: -8 - }], - width: 0, - height: this.constants.NORMAL_SIZE + } + }] }; - }, - - mounted: function () { - var self = this; - this.slider.element.hover(function () { - self._enlarge(); - }, function () { - self._normalize(); - }); - }, - - - _enlarge: function () { - this.slider.setWidth(this.constants.LARGE_SIZE); - this.slider.setHeight(this.constants.LARGE_SIZE); - this.wrapper.attr("items")[0].top = this.constants.LARGE_OFFSET; - this.wrapper.attr("items")[0].left = -10; - this.wrapper.resize(); - }, - - _normalize: function () { - this.slider.setWidth(this.constants.NORMAL_SIZE); - this.slider.setHeight(this.constants.NORMAL_SIZE); - this.wrapper.attr("items")[0].top = this.constants.NORMAL_OFFSET; - this.wrapper.attr("items")[0].left = -8; - this.wrapper.resize(); } }); BI.shortcut("bi.single_slider_button", BI.SliderIconButton);/** diff --git a/dist/widget.css b/dist/widget.css index a9aa1c535..e2d5bb3bd 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -417,12 +417,20 @@ -moz-border-radius: 8px; border-radius: 8px; background-color: #ffffff; + height: 16px; + width: 16px; + top: 6px; + left: -8px; } .bi-single-slider-button .slider-button:hover, .bi-single-slider-button .slider-button.hover { -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; + width: 20px; + height: 20px; + top: 4px; + left: -10px; } .bi-slider-track .gray-track { background-color: #F2F4F7; diff --git a/dist/widget.js b/dist/widget.js index b06e1cd83..1ec6a33df 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -20892,44 +20892,12 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", cls: "slider-button", - height: this.constants.NORMAL_SIZE, - width: this.constants.NORMAL_SIZE, ref: function () { self.slider = this; } - }, - top: this.constants.NORMAL_OFFSET, - left: -8 - }], - width: 0, - height: this.constants.NORMAL_SIZE + } + }] }; - }, - - mounted: function () { - var self = this; - this.slider.element.hover(function () { - self._enlarge(); - }, function () { - self._normalize(); - }); - }, - - - _enlarge: function () { - this.slider.setWidth(this.constants.LARGE_SIZE); - this.slider.setHeight(this.constants.LARGE_SIZE); - this.wrapper.attr("items")[0].top = this.constants.LARGE_OFFSET; - this.wrapper.attr("items")[0].left = -10; - this.wrapper.resize(); - }, - - _normalize: function () { - this.slider.setWidth(this.constants.NORMAL_SIZE); - this.slider.setHeight(this.constants.NORMAL_SIZE); - this.wrapper.attr("items")[0].top = this.constants.NORMAL_OFFSET; - this.wrapper.attr("items")[0].left = -8; - this.wrapper.resize(); } }); BI.shortcut("bi.single_slider_button", BI.SliderIconButton);/** diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index 1923e9182..f73c82f2b 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -44,7 +44,7 @@ BI.PopupView = BI.inherit(BI.Widget, { BI.PopupView.superclass._init.apply(this, arguments); var self = this, o = this.options; var fn = function (e) { - e.stopEvent(); + e.stopPropagation(); }, stop = function (e) { e.stopEvent(); return false; diff --git a/src/css/widget/singleslider/slider/widget.css b/src/css/widget/singleslider/slider/widget.css index 4cddf4857..eab547c5d 100644 --- a/src/css/widget/singleslider/slider/widget.css +++ b/src/css/widget/singleslider/slider/widget.css @@ -5,10 +5,18 @@ -moz-border-radius: 8px; border-radius: 8px; background-color: #ffffff; + height: 16px; + width: 16px; + top: 6px; + left: -8px; } .bi-single-slider-button .slider-button:hover, .bi-single-slider-button .slider-button.hover { -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; + width: 20px; + height: 20px; + top: 4px; + left: -10px; } diff --git a/src/less/widget/singleslider/slider/widget.slider.less b/src/less/widget/singleslider/slider/widget.slider.less index 003b7bbd7..33c48e13f 100644 --- a/src/less/widget/singleslider/slider/widget.slider.less +++ b/src/less/widget/singleslider/slider/widget.slider.less @@ -6,8 +6,16 @@ border: 2px solid @color-bi-border-highlight; .border-radius(8px); background-color: @color-bi-background-default; + height: 16px; + width: 16px; + top: 6px; + left: -8px; &:hover, &.hover { .border-radius(10px); + width: 20px; + height: 20px; + top: 4px; + left: -10px; } } } \ No newline at end of file diff --git a/src/widget/singleslider/button/iconbutton.slider.js b/src/widget/singleslider/button/iconbutton.slider.js index d4f56619e..b6589e333 100644 --- a/src/widget/singleslider/button/iconbutton.slider.js +++ b/src/widget/singleslider/button/iconbutton.slider.js @@ -25,44 +25,12 @@ BI.SliderIconButton = BI.inherit(BI.Widget, { el: { type: "bi.text_button", cls: "slider-button", - height: this.constants.NORMAL_SIZE, - width: this.constants.NORMAL_SIZE, ref: function () { self.slider = this; } - }, - top: this.constants.NORMAL_OFFSET, - left: -8 - }], - width: 0, - height: this.constants.NORMAL_SIZE + } + }] }; - }, - - mounted: function () { - var self = this; - this.slider.element.hover(function () { - self._enlarge(); - }, function () { - self._normalize(); - }); - }, - - - _enlarge: function () { - this.slider.setWidth(this.constants.LARGE_SIZE); - this.slider.setHeight(this.constants.LARGE_SIZE); - this.wrapper.attr("items")[0].top = this.constants.LARGE_OFFSET; - this.wrapper.attr("items")[0].left = -10; - this.wrapper.resize(); - }, - - _normalize: function () { - this.slider.setWidth(this.constants.NORMAL_SIZE); - this.slider.setHeight(this.constants.NORMAL_SIZE); - this.wrapper.attr("items")[0].top = this.constants.NORMAL_OFFSET; - this.wrapper.attr("items")[0].left = -8; - this.wrapper.resize(); } }); BI.shortcut("bi.single_slider_button", BI.SliderIconButton); \ No newline at end of file