fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'ee332c7651a8673f22b42397edc86ed2aba22bee':
  update
  BI-22465
es6
guy 7 years ago
parent
cc95e25ea2 ee332c7651
commit
ecefe3613e
10 changed files with 180 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      dist/_fineui.min.js
  2. 60
      dist/bundle.js
  3. 16
      dist/bundle.min.js
  4. 60
      dist/fineui.js
  5. 24
      dist/fineui.min.js
  6. 60
      dist/widget.js
  7. 26
      src/widget/intervalslider/intervalslider.js
  8. 24
      src/widget/singleslider/singleslider.js
  9. 5
      src/widget/singleslider/singleslider.label.js
  10. 5
      src/widget/singleslider/singleslider.normal.js

24
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

60
dist/bundle.js vendored
Unescape View File

@ -94460,16 +94460,13 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () { props: {
return BI.extend(BI.IntervalSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-interval-slider bi-slider-track",
baseCls: "bi-interval-slider bi-slider-track", digit: false,
digit: false, unit: ""
unit: ""
});
}, },
_init: function () { render: function () {
BI.IntervalSlider.superclass._init.apply(this, arguments);
var self = this; var self = this;
var c = this._constant; var c = this._constant;
@ -94559,7 +94556,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
this._draggable(this.sliderTwo, false); this._draggable(this.sliderTwo, false);
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -94580,10 +94577,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}, },
this._createLabelWrapper(), this._createLabelWrapper(),
this._createSliderWrapper() this._createSliderWrapper()
] ]
}); };
}, },
_rePosBySizeAfterMove: function (size, isLeft) { _rePosBySizeAfterMove: function (size, isLeft) {
@ -94894,6 +94891,11 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
return value; return value;
}, },
_setEnable: function (b) {
BI.IntervalSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
if (this.valueOne <= this.valueTwo) { if (this.valueOne <= this.valueTwo) {
return {min: this.valueOne, max: this.valueTwo}; return {min: this.valueOne, max: this.valueTwo};
@ -106855,16 +106857,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
SLIDER_HEIGHT: 30, SLIDER_HEIGHT: 30,
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { props: {
baseCls: "bi-single-slider bi-slider-track", baseCls: "bi-single-slider bi-slider-track",
digit: false, digit: false,
unit: "" unit: ""
});
}, },
_init: function () {
BI.SingleSlider.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var c = this._constant; var c = this._constant;
this.enable = false; this.enable = false;
@ -106944,9 +106944,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
self.fireEvent(BI.SingleSlider.EVENT_CHANGE); self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
}); });
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.vertical", type: "bi.vertical",
@ -106983,7 +106982,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}] }]
}); };
}, },
_draggable: function (widget) { _draggable: function (widget) {
@ -107137,6 +107136,11 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (b) {
BI.SingleSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
setMinAndMax: function (v) { setMinAndMax: function (v) {
var minNumber = BI.parseFloat(v.min); var minNumber = BI.parseFloat(v.min);
var maxNumber = BI.parseFloat(v.max); var maxNumber = BI.parseFloat(v.max);
@ -107417,6 +107421,11 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderLabel.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },
@ -107695,6 +107704,11 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderNormal.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },

16
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

60
dist/fineui.js vendored
Unescape View File

@ -94703,16 +94703,13 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () { props: {
return BI.extend(BI.IntervalSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-interval-slider bi-slider-track",
baseCls: "bi-interval-slider bi-slider-track", digit: false,
digit: false, unit: ""
unit: ""
});
}, },
_init: function () { render: function () {
BI.IntervalSlider.superclass._init.apply(this, arguments);
var self = this; var self = this;
var c = this._constant; var c = this._constant;
@ -94802,7 +94799,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
this._draggable(this.sliderTwo, false); this._draggable(this.sliderTwo, false);
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -94823,10 +94820,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}, },
this._createLabelWrapper(), this._createLabelWrapper(),
this._createSliderWrapper() this._createSliderWrapper()
] ]
}); };
}, },
_rePosBySizeAfterMove: function (size, isLeft) { _rePosBySizeAfterMove: function (size, isLeft) {
@ -95137,6 +95134,11 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
return value; return value;
}, },
_setEnable: function (b) {
BI.IntervalSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
if (this.valueOne <= this.valueTwo) { if (this.valueOne <= this.valueTwo) {
return {min: this.valueOne, max: this.valueTwo}; return {min: this.valueOne, max: this.valueTwo};
@ -107098,16 +107100,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
SLIDER_HEIGHT: 30, SLIDER_HEIGHT: 30,
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { props: {
baseCls: "bi-single-slider bi-slider-track", baseCls: "bi-single-slider bi-slider-track",
digit: false, digit: false,
unit: "" unit: ""
});
}, },
_init: function () {
BI.SingleSlider.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var c = this._constant; var c = this._constant;
this.enable = false; this.enable = false;
@ -107187,9 +107187,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
self.fireEvent(BI.SingleSlider.EVENT_CHANGE); self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
}); });
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.vertical", type: "bi.vertical",
@ -107226,7 +107225,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}] }]
}); };
}, },
_draggable: function (widget) { _draggable: function (widget) {
@ -107380,6 +107379,11 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (b) {
BI.SingleSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
setMinAndMax: function (v) { setMinAndMax: function (v) {
var minNumber = BI.parseFloat(v.min); var minNumber = BI.parseFloat(v.min);
var maxNumber = BI.parseFloat(v.max); var maxNumber = BI.parseFloat(v.max);
@ -107660,6 +107664,11 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderLabel.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },
@ -107938,6 +107947,11 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderNormal.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },

24
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

60
dist/widget.js vendored
Unescape View File

@ -6877,16 +6877,13 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () { props: {
return BI.extend(BI.IntervalSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-interval-slider bi-slider-track",
baseCls: "bi-interval-slider bi-slider-track", digit: false,
digit: false, unit: ""
unit: ""
});
}, },
_init: function () { render: function () {
BI.IntervalSlider.superclass._init.apply(this, arguments);
var self = this; var self = this;
var c = this._constant; var c = this._constant;
@ -6976,7 +6973,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
this._draggable(this.sliderTwo, false); this._draggable(this.sliderTwo, false);
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -6997,10 +6994,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}, },
this._createLabelWrapper(), this._createLabelWrapper(),
this._createSliderWrapper() this._createSliderWrapper()
] ]
}); };
}, },
_rePosBySizeAfterMove: function (size, isLeft) { _rePosBySizeAfterMove: function (size, isLeft) {
@ -7311,6 +7308,11 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
return value; return value;
}, },
_setEnable: function (b) {
BI.IntervalSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
if (this.valueOne <= this.valueTwo) { if (this.valueOne <= this.valueTwo) {
return {min: this.valueOne, max: this.valueTwo}; return {min: this.valueOne, max: this.valueTwo};
@ -19272,16 +19274,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
SLIDER_HEIGHT: 30, SLIDER_HEIGHT: 30,
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { props: {
baseCls: "bi-single-slider bi-slider-track", baseCls: "bi-single-slider bi-slider-track",
digit: false, digit: false,
unit: "" unit: ""
});
}, },
_init: function () {
BI.SingleSlider.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var c = this._constant; var c = this._constant;
this.enable = false; this.enable = false;
@ -19361,9 +19361,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
self.fireEvent(BI.SingleSlider.EVENT_CHANGE); self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
}); });
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.vertical", type: "bi.vertical",
@ -19400,7 +19399,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}] }]
}); };
}, },
_draggable: function (widget) { _draggable: function (widget) {
@ -19554,6 +19553,11 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (b) {
BI.SingleSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
setMinAndMax: function (v) { setMinAndMax: function (v) {
var minNumber = BI.parseFloat(v.min); var minNumber = BI.parseFloat(v.min);
var maxNumber = BI.parseFloat(v.max); var maxNumber = BI.parseFloat(v.max);
@ -19834,6 +19838,11 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderLabel.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },
@ -20112,6 +20121,11 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderNormal.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },

26
src/widget/intervalslider/intervalslider.js
Unescape View File

@ -12,16 +12,13 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () { props: {
return BI.extend(BI.IntervalSlider.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-interval-slider bi-slider-track",
baseCls: "bi-interval-slider bi-slider-track", digit: false,
digit: false, unit: ""
unit: ""
});
}, },
_init: function () { render: function () {
BI.IntervalSlider.superclass._init.apply(this, arguments);
var self = this; var self = this;
var c = this._constant; var c = this._constant;
@ -111,7 +108,7 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
this._draggable(this.sliderTwo, false); this._draggable(this.sliderTwo, false);
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this, element: this,
items: [{ items: [{
@ -132,10 +129,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}, },
this._createLabelWrapper(), this._createLabelWrapper(),
this._createSliderWrapper() this._createSliderWrapper()
] ]
}); };
}, },
_rePosBySizeAfterMove: function (size, isLeft) { _rePosBySizeAfterMove: function (size, isLeft) {
@ -446,6 +443,11 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
return value; return value;
}, },
_setEnable: function (b) {
BI.IntervalSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
if (this.valueOne <= this.valueTwo) { if (this.valueOne <= this.valueTwo) {
return {min: this.valueOne, max: this.valueTwo}; return {min: this.valueOne, max: this.valueTwo};

24
src/widget/singleslider/singleslider.js
Unescape View File

@ -10,16 +10,14 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
SLIDER_HEIGHT: 30, SLIDER_HEIGHT: 30,
TRACK_HEIGHT: 24 TRACK_HEIGHT: 24
}, },
_defaultConfig: function () {
return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), { props: {
baseCls: "bi-single-slider bi-slider-track", baseCls: "bi-single-slider bi-slider-track",
digit: false, digit: false,
unit: "" unit: ""
});
}, },
_init: function () {
BI.SingleSlider.superclass._init.apply(this, arguments);
render: function () {
var self = this, o = this.options; var self = this, o = this.options;
var c = this._constant; var c = this._constant;
this.enable = false; this.enable = false;
@ -99,9 +97,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
self.fireEvent(BI.SingleSlider.EVENT_CHANGE); self.fireEvent(BI.SingleSlider.EVENT_CHANGE);
}); });
this._setVisible(false); this._setVisible(false);
BI.createWidget({ return {
type: "bi.absolute", type: "bi.absolute",
element: this,
items: [{ items: [{
el: { el: {
type: "bi.vertical", type: "bi.vertical",
@ -138,7 +135,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
left: 0, left: 0,
width: "100%" width: "100%"
}] }]
}); };
}, },
_draggable: function (widget) { _draggable: function (widget) {
@ -292,6 +289,11 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (b) {
BI.SingleSlider.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
setMinAndMax: function (v) { setMinAndMax: function (v) {
var minNumber = BI.parseFloat(v.min); var minNumber = BI.parseFloat(v.min);
var maxNumber = BI.parseFloat(v.max); var maxNumber = BI.parseFloat(v.max);

5
src/widget/singleslider/singleslider.label.js
Unescape View File

@ -243,6 +243,11 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderLabel.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },

5
src/widget/singleslider/singleslider.normal.js
Unescape View File

@ -221,6 +221,11 @@ BI.SingleSliderNormal = BI.inherit(BI.Widget, {
return (v - this.min) * 100 / (this.max - this.min); return (v - this.min) * 100 / (this.max - this.min);
}, },
_setEnable: function (b) {
BI.SingleSliderNormal.superclass._setEnable.apply(this, [b]);
this.blueTrack && this.blueTrack.setVisible(!!b);
},
getValue: function () { getValue: function () {
return this.value; return this.value;
}, },

Write Preview
Loading…
Cancel
Save