diff --git a/dist/base.js b/dist/base.js
index ebeb44cdc..5fa206483 100644
--- a/dist/base.js
+++ b/dist/base.js
@@ -18247,10 +18247,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor();
- var options = {className: "param", atomic: true, replacedWith: $("").text(param)[0]};
+ var className = "param";
if (BI.isNotNull(param.match(/^$/))) {
- options.className = "error-param";
+ className = "error-param";
}
+ var options = {className: className, atomic: true, replacedWith: $("").text(param)[0]};
options.value = value;
this.editor.markText(from, to, options);
this.editor.replaceSelection(" ");
diff --git a/dist/bundle.css b/dist/bundle.css
index f35f38472..5fe75243c 100644
--- a/dist/bundle.css
+++ b/dist/bundle.css
@@ -4591,8 +4591,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
+ background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
diff --git a/dist/bundle.js b/dist/bundle.js
index 68732d8b9..3fab2b9a6 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -54052,10 +54052,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor();
- var options = {className: "param", atomic: true, replacedWith: $("").text(param)[0]};
+ var className = "param";
if (BI.isNotNull(param.match(/^$/))) {
- options.className = "error-param";
+ className = "error-param";
}
+ var options = {className: className, atomic: true, replacedWith: $("").text(param)[0]};
options.value = value;
this.editor.markText(from, to, options);
this.editor.replaceSelection(" ");
@@ -76132,7 +76133,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, {
- type: "bi.color_picker_editor"
+ type: "bi.simple_color_picker_editor"
});
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue());
@@ -76162,7 +76163,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic,
left: 15,
right: 15,
- top: 10
+ top: 7
}],
height: 215
}]
@@ -77200,9 +77201,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}
},
- _setEnable: function (enable) {
+ _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
- this.mask.setVisible(!enable);
+ this._showPreColor(this.getValue());
},
setValue: function (color) {
@@ -77264,7 +77265,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor",
// width: 200,
- height: 20
+ height: 30
});
},
@@ -77274,8 +77275,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
- height: 20,
- width: 40
+ height: 16,
+ width: 16
});
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label",
@@ -77314,9 +77315,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.colorShow,
- width: 40,
- lgap: 5,
- rgap: 5
+ width: 16,
+ lgap: 20,
+ rgap: 15
}, {
el: RGB[0],
width: 20
@@ -101388,6 +101389,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
+ trigger: o.trigger,
el: this.trigger,
adjustLength: 1,
popup: {
@@ -107831,7 +107833,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
});
});
- BI.createWidget({
+ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
@@ -108249,6 +108251,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
+ // this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
+ // this.label.formatTextWrapper.resize();
},
_setSliderPosition: function (percent) {
@@ -113051,6 +113055,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
+ trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@@ -113071,7 +113076,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue();
},
- populate: function () {
+ populate: function (items) {
+ this._initData(items);
this.combo.populate.apply(this.combo, arguments);
}
});
diff --git a/dist/case.js b/dist/case.js
index 70cf1f1ef..296713e45 100644
--- a/dist/case.js
+++ b/dist/case.js
@@ -3568,7 +3568,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, {
- type: "bi.color_picker_editor"
+ type: "bi.simple_color_picker_editor"
});
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue());
@@ -3598,7 +3598,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic,
left: 15,
right: 15,
- top: 10
+ top: 7
}],
height: 215
}]
@@ -4636,9 +4636,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}
},
- _setEnable: function (enable) {
+ _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
- this.mask.setVisible(!enable);
+ this._showPreColor(this.getValue());
},
setValue: function (color) {
@@ -4700,7 +4700,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor",
// width: 200,
- height: 20
+ height: 30
});
},
@@ -4710,8 +4710,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
- height: 20,
- width: 40
+ height: 16,
+ width: 16
});
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label",
@@ -4750,9 +4750,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.colorShow,
- width: 40,
- lgap: 5,
- rgap: 5
+ width: 16,
+ lgap: 20,
+ rgap: 15
}, {
el: RGB[0],
width: 20
diff --git a/dist/fineui.css b/dist/fineui.css
index 55aab47a3..1ca026081 100644
--- a/dist/fineui.css
+++ b/dist/fineui.css
@@ -4591,8 +4591,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
+ background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
diff --git a/dist/fineui.js b/dist/fineui.js
index 991969e4c..39269cf13 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -54301,10 +54301,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor();
- var options = {className: "param", atomic: true, replacedWith: $("").text(param)[0]};
+ var className = "param";
if (BI.isNotNull(param.match(/^$/))) {
- options.className = "error-param";
+ className = "error-param";
}
+ var options = {className: className, atomic: true, replacedWith: $("").text(param)[0]};
options.value = value;
this.editor.markText(from, to, options);
this.editor.replaceSelection(" ");
@@ -76381,7 +76382,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, {
- type: "bi.color_picker_editor"
+ type: "bi.simple_color_picker_editor"
});
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue());
@@ -76411,7 +76412,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic,
left: 15,
right: 15,
- top: 10
+ top: 7
}],
height: 215
}]
@@ -77449,9 +77450,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}
},
- _setEnable: function (enable) {
+ _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
- this.mask.setVisible(!enable);
+ this._showPreColor(this.getValue());
},
setValue: function (color) {
@@ -77513,7 +77514,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor",
// width: 200,
- height: 20
+ height: 30
});
},
@@ -77523,8 +77524,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
- height: 20,
- width: 40
+ height: 16,
+ width: 16
});
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label",
@@ -77563,9 +77564,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.colorShow,
- width: 40,
- lgap: 5,
- rgap: 5
+ width: 16,
+ lgap: 20,
+ rgap: 15
}, {
el: RGB[0],
width: 20
@@ -101637,6 +101638,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
+ trigger: o.trigger,
el: this.trigger,
adjustLength: 1,
popup: {
@@ -108080,7 +108082,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
});
});
- BI.createWidget({
+ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
@@ -108498,6 +108500,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
+ // this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
+ // this.label.formatTextWrapper.resize();
},
_setSliderPosition: function (percent) {
@@ -113300,6 +113304,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
+ trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@@ -113320,7 +113325,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue();
},
- populate: function () {
+ populate: function (items) {
+ this._initData(items);
this.combo.populate.apply(this.combo, arguments);
}
});
diff --git a/dist/resource.css b/dist/resource.css
index deffee0a6..14c058078 100644
--- a/dist/resource.css
+++ b/dist/resource.css
@@ -320,8 +320,8 @@ textarea::-webkit-scrollbar-thumb:hover {
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
+ background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
diff --git a/dist/widget.js b/dist/widget.js
index 3e19840af..9598ff5cf 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -13586,6 +13586,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
+ trigger: o.trigger,
el: this.trigger,
adjustLength: 1,
popup: {
@@ -20029,7 +20030,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
});
});
- BI.createWidget({
+ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
@@ -20447,6 +20448,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
+ // this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
+ // this.label.formatTextWrapper.resize();
},
_setSliderPosition: function (percent) {
@@ -25249,6 +25252,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
+ trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@@ -25269,7 +25273,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue();
},
- populate: function () {
+ populate: function (items) {
+ this._initData(items);
this.combo.populate.apply(this.combo, arguments);
}
});
diff --git a/public/css/background.css b/public/css/background.css
index d6c99c895..8c2aa37f2 100644
--- a/public/css/background.css
+++ b/public/css/background.css
@@ -249,8 +249,8 @@
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal.png');
+ background: url('https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='https://fanruan.coding.me/fineui/dist/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
diff --git a/src/base/single/editor/editor.code.js b/src/base/single/editor/editor.code.js
index 9b2fc09dd..e5d1a9929 100644
--- a/src/base/single/editor/editor.code.js
+++ b/src/base/single/editor/editor.code.js
@@ -124,10 +124,11 @@ BI.CodeEditor = BI.inherit(BI.Single, {
// 解决插入字段由括号或其他特殊字符包围时分裂的bug,在两端以不可见字符包裹一下
this.editor.replaceSelection("\u200b" + param + "\u200b");
var to = this.editor.getCursor();
- var options = {className: "param", atomic: true, replacedWith: $("").text(param)[0]};
+ var className = "param";
if (BI.isNotNull(param.match(/^$/))) {
- options.className = "error-param";
+ className = "error-param";
}
+ var options = {className: className, atomic: true, replacedWith: $("").text(param)[0]};
options.value = value;
this.editor.markText(from, to, options);
this.editor.replaceSelection(" ");
diff --git a/src/case/colorchooser/colorchooser.custom.js b/src/case/colorchooser/colorchooser.custom.js
index 0cf67cd52..99120d6dc 100644
--- a/src/case/colorchooser/colorchooser.custom.js
+++ b/src/case/colorchooser/colorchooser.custom.js
@@ -19,7 +19,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
BI.CustomColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.editor = BI.createWidget(o.editor, {
- type: "bi.color_picker_editor"
+ type: "bi.simple_color_picker_editor"
});
this.editor.on(BI.ColorPickerEditor.EVENT_CHANGE, function () {
self.setValue(this.getValue());
@@ -49,7 +49,7 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
el: this.farbtastic,
left: 15,
right: 15,
- top: 10
+ top: 7
}],
height: 215
}]
diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.js b/src/case/colorchooser/colorpicker/editor.colorpicker.js
index f8cd6069b..284167003 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js
@@ -190,9 +190,9 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
}
},
- _setEnable: function (enable) {
+ _setEnable: function () {
BI.ColorPickerEditor.superclass._setEnable.apply(this, arguments);
- this.mask.setVisible(!enable);
+ this._showPreColor(this.getValue());
},
setValue: function (color) {
diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.simple.js b/src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
index a81e9d61d..c533bc5b3 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.simple.js
@@ -11,7 +11,7 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
return BI.extend(BI.SimpleColorPickerEditor.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-picker-editor",
// width: 200,
- height: 20
+ height: 30
});
},
@@ -21,8 +21,8 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
this.colorShow = BI.createWidget({
type: "bi.layout",
cls: "color-picker-editor-display bi-card",
- height: 20,
- width: 40
+ height: 16,
+ width: 16
});
var RGB = BI.createWidgets(BI.createItems([{text: "R"}, {text: "G"}, {text: "B"}], {
type: "bi.label",
@@ -61,9 +61,9 @@ BI.SimpleColorPickerEditor = BI.inherit(BI.Widget, {
element: this,
items: [{
el: this.colorShow,
- width: 40,
- lgap: 5,
- rgap: 5
+ width: 16,
+ lgap: 20,
+ rgap: 15
}, {
el: RGB[0],
width: 20
diff --git a/src/component/treevaluechooser/combo.treevaluechooser.js b/src/component/treevaluechooser/combo.treevaluechooser.js
index 4831945c0..0469d1155 100644
--- a/src/component/treevaluechooser/combo.treevaluechooser.js
+++ b/src/component/treevaluechooser/combo.treevaluechooser.js
@@ -25,6 +25,7 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
}
this.combo = BI.createWidget({
type: "bi.multi_tree_combo",
+ trigger: o.trigger,
element: this,
itemsCreator: BI.bind(this._itemsCreator, this),
valueFormatter: BI.bind(this._valueFormatter, this),
@@ -45,7 +46,8 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
return this.combo.getValue();
},
- populate: function () {
+ populate: function (items) {
+ this._initData(items);
this.combo.populate.apply(this.combo, arguments);
}
});
diff --git a/src/css/resource/background.css b/src/css/resource/background.css
index 34f4359d1..4cdde93d1 100644
--- a/src/css/resource/background.css
+++ b/src/css/resource/background.css
@@ -249,8 +249,8 @@
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal.png');
+ background: url('images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {
diff --git a/src/less/lib/background.less b/src/less/lib/background.less
index 50cff5315..b82907e73 100644
--- a/src/less/lib/background.less
+++ b/src/less/lib/background.less
@@ -1,6 +1,6 @@
@background-auto-color: "background/auto_color.png";
@background-auto-color-normal: "background/auto_color_normal.png";
-@background-auto-color-normal-disabled: "background/auto_color_normal.png";
+@background-auto-color-normal-disabled: "background/auto_color_normal_disable.png";
@background-trans-color: "background/trans_normal.png";
@background-trans-color-disabled: "background/trans_disable.png";
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index 2adc073ad..017d99e61 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@@ -62,6 +62,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
this.combo = BI.createWidget({
type: "bi.combo",
toggle: false,
+ trigger: o.trigger,
el: this.trigger,
adjustLength: 1,
popup: {
diff --git a/src/widget/singleslider/button/editor.sign.text.js b/src/widget/singleslider/button/editor.sign.text.js
index 9149141fa..724f1725f 100644
--- a/src/widget/singleslider/button/editor.sign.text.js
+++ b/src/widget/singleslider/button/editor.sign.text.js
@@ -63,7 +63,7 @@ BI.SignTextEditor = BI.inherit(BI.Widget, {
self.fireEvent(BI.SignTextEditor.EVENT_CLICK_LABEL);
});
});
- BI.createWidget({
+ this.formatTextWrapper = BI.createWidget({
type: "bi.absolute",
element: this,
items: [{
diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js
index e8670d851..6882a417b 100644
--- a/src/widget/singleslider/singleslider.js
+++ b/src/widget/singleslider/singleslider.js
@@ -239,6 +239,8 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
_setLabelPosition: function (percent) {
this.label.element.css({left: percent + "%"});
+ // this.label.formatTextWrapper.attr("items")[0].left = percent + "%";
+ // this.label.formatTextWrapper.resize();
},
_setSliderPosition: function (percent) {
diff --git a/ui/css/background.css b/ui/css/background.css
index 1f165e498..4707bf77a 100644
--- a/ui/css/background.css
+++ b/ui/css/background.css
@@ -249,8 +249,8 @@
_background: none;
}
.auto-color-normal-disabled-background {
- background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png') no-repeat center center;
- _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal.png');
+ background: url('resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png') no-repeat center center;
+ _filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='resources?path=/com/fr/web/ui/images/1x/background/auto_color_normal_disable.png');
_background: none;
}
.trans-color-background {