caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #618 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit 'e455e63dc8e6dd730f87ecdd919b19ad56231aaf':
  更新
es6
windy 6 years ago
parent
56378ecaa3 e455e63dc8
commit
0cdb2fff77
9 changed files with 86 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      demo/js/case/demo.color_chooser_popup.js
  2. 21
      dist/bundle.js
  3. 38
      dist/bundle.min.js
  4. 21
      dist/case.js
  5. 1
      dist/demo.js
  6. 21
      dist/fineui.js
  7. 38
      dist/fineui.min.js
  8. 3
      src/case/colorchooser/colorchooser.popup.js
  9. 18
      src/case/colorchooser/colorpicker/editor.colorpicker.js

1
demo/js/case/demo.color_chooser_popup.js
Unescape View File

@ -9,7 +9,6 @@ Demo.Func = BI.inherit(BI.Widget, {
items: [{
el: {
type: "bi.color_chooser_popup",
disabled: true,
cls: "bi-card"
},
left: 100,

21
dist/bundle.js vendored
Unescape View File

@ -50912,7 +50912,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor",
value: o.value,
cls: "bi-background bi-border-bottom",
cls: "bi-header-background bi-border-bottom",
height: 30
});
@ -50988,6 +50988,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.more = BI.createWidget({
type: "bi.combo",
cls: "bi-border-top",
container: null,
direction: "right,top",
isNeedAdjustHeight: false,
@ -51668,7 +51669,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: 32,
width: 30,
height: 20
});
BI.each(Ws, function (i, w) {
@ -51687,8 +51688,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.none = BI.createWidget({
type: "bi.icon_button",
cls: "auto-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Basic_Auto")
@ -51709,8 +51710,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.transparent = BI.createWidget({
type: "bi.icon_button",
cls: "trans-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Transparent_Color")
@ -51761,14 +51762,16 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
width: 30
}, {
el: this.transparent,
width: 24
width: 16,
lgap: 5
}, {
el: this.none,
width: 24
width: 16,
lgap: 5
}]
},
left: 10,
right: 20,
right: 10,
top: 0,
bottom: 0
}]

38
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
dist/case.js vendored
Unescape View File

@ -2328,7 +2328,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor",
value: o.value,
cls: "bi-background bi-border-bottom",
cls: "bi-header-background bi-border-bottom",
height: 30
});
@ -2404,6 +2404,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.more = BI.createWidget({
type: "bi.combo",
cls: "bi-border-top",
container: null,
direction: "right,top",
isNeedAdjustHeight: false,
@ -3084,7 +3085,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: 32,
width: 30,
height: 20
});
BI.each(Ws, function (i, w) {
@ -3103,8 +3104,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.none = BI.createWidget({
type: "bi.icon_button",
cls: "auto-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Basic_Auto")
@ -3125,8 +3126,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.transparent = BI.createWidget({
type: "bi.icon_button",
cls: "trans-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Transparent_Color")
@ -3177,14 +3178,16 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
width: 30
}, {
el: this.transparent,
width: 24
width: 16,
lgap: 5
}, {
el: this.none,
width: 24
width: 16,
lgap: 5
}]
},
left: 10,
right: 20,
right: 10,
top: 0,
bottom: 0
}]

1
dist/demo.js vendored
Unescape View File

@ -1732,7 +1732,6 @@ BI.shortcut("demo.click_item_effect", Demo.Func);Demo.Func = BI.inherit(BI.Widge
items: [{
el: {
type: "bi.color_chooser_popup",
disabled: true,
cls: "bi-card"
},
left: 100,

21
dist/fineui.js vendored
Unescape View File

@ -51151,7 +51151,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor",
value: o.value,
cls: "bi-background bi-border-bottom",
cls: "bi-header-background bi-border-bottom",
height: 30
});
@ -51227,6 +51227,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.more = BI.createWidget({
type: "bi.combo",
cls: "bi-border-top",
container: null,
direction: "right,top",
isNeedAdjustHeight: false,
@ -51907,7 +51908,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: 32,
width: 30,
height: 20
});
BI.each(Ws, function (i, w) {
@ -51926,8 +51927,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.none = BI.createWidget({
type: "bi.icon_button",
cls: "auto-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Basic_Auto")
@ -51948,8 +51949,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.transparent = BI.createWidget({
type: "bi.icon_button",
cls: "trans-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Transparent_Color")
@ -52000,14 +52001,16 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
width: 30
}, {
el: this.transparent,
width: 24
width: 16,
lgap: 5
}, {
el: this.none,
width: 24
width: 16,
lgap: 5
}]
},
left: 10,
right: 20,
right: 10,
top: 0,
bottom: 0
}]

38
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/case/colorchooser/colorchooser.popup.js
Unescape View File

@ -18,7 +18,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.colorEditor = BI.createWidget(o.editor, {
type: "bi.color_picker_editor",
value: o.value,
cls: "bi-background bi-border-bottom",
cls: "bi-header-background bi-border-bottom",
height: 30
});
@ -94,6 +94,7 @@ BI.ColorChooserPopup = BI.inherit(BI.Widget, {
this.more = BI.createWidget({
type: "bi.combo",
cls: "bi-border-top",
container: null,
direction: "right,top",
isNeedAdjustHeight: false,

18
src/case/colorchooser/colorpicker/editor.colorpicker.js
Unescape View File

@ -42,7 +42,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
errorText: BI.i18nText("BI-Color_Picker_Error_Text"),
allowBlank: true,
value: 255,
width: 32,
width: 30,
height: 20
});
BI.each(Ws, function (i, w) {
@ -61,8 +61,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.none = BI.createWidget({
type: "bi.icon_button",
cls: "auto-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Basic_Auto")
@ -83,8 +83,8 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
this.transparent = BI.createWidget({
type: "bi.icon_button",
cls: "trans-color-icon",
width: 24,
height: 24,
width: 16,
height: 16,
iconWidth: 16,
iconHeight: 16,
title: BI.i18nText("BI-Transparent_Color")
@ -135,14 +135,16 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
width: 30
}, {
el: this.transparent,
width: 24
width: 16,
lgap: 5
}, {
el: this.none,
width: 24
width: 16,
lgap: 5
}]
},
left: 10,
right: 20,
right: 10,
top: 0,
bottom: 0
}]

Write Preview
Loading…
Cancel
Save