diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 7d55fab96..810293c4b 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -43,3 +43,9 @@ .box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80)); } } + +.hack { + .bi-popup-view { + position: -ms-page !important; + } +} \ No newline at end of file diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index 24c87c336..a998064c7 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -4,7 +4,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-down-list-combo", + baseCls: "bi-down-list-combo" + (BI.isIE() ? " hack" : ""), height: 24, items: [], adjustLength: 0, diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js index eb0a700c7..12aba0196 100644 --- a/src/widget/singleslider/singleslider.js +++ b/src/widget/singleslider/singleslider.js @@ -315,14 +315,19 @@ BI.SingleSlider = BI.inherit(BI.Single, { this.min = 0; this.max = 0; this._setBlueTrack(0); - }, populate: function () { + var o = this.options; if (!isNaN(this.min) && !isNaN(this.max)) { this._setVisible(true); this.enable = true; - this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max)); + if (o.digit) { + this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max)); + } else { + this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Integer_Number_Between", this.min, this.max)); + } + if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) { this.label.setValue(this.value); this._setAllPosition(this._getPercentByValue(this.value));