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

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

* commit '9d22d1bcaff5b8f9572b756d359fac05e73216ff':
  update
  BI-22463 rich_edior和color_chooser_trigger灰化
  update
es6
guy 7 years ago
parent
f3c65859a9 9d22d1bcaf
commit
0c05114c8c
17 changed files with 121 additions and 86 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. 50
      dist/_fineui.min.js
  2. 3
      dist/base.css
  3. 10
      dist/base.js
  4. 3
      dist/bundle.css
  5. 15
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 28
      dist/bundle.min.js
  8. 5
      dist/case.js
  9. 3
      dist/fineui.css
  10. 15
      dist/fineui.js
  11. 2
      dist/fineui.min.css
  12. 50
      dist/fineui.min.js
  13. 1
      src/base/single/button/button.basic.js
  14. 9
      src/base/single/label/label.js
  15. 5
      src/case/richeditor/richeditor.js
  16. 3
      src/css/base/single/button/button.css
  17. 3
      src/less/base/single/button/button.less

50
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.css vendored
Unescape View File

@ -1334,6 +1334,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

10
dist/base.js vendored
Unescape View File

@ -842,6 +842,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -20398,6 +20399,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },

3
dist/bundle.css vendored
Unescape View File

@ -3380,6 +3380,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

15
dist/bundle.js vendored
Unescape View File

@ -36608,6 +36608,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -56164,6 +56165,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },
@ -84188,11 +84198,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) {
BI.RichEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
focus: function () { focus: function () {
this.editor.focus(); this.editor.focus();
}, },

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

28
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
dist/case.js vendored
Unescape View File

@ -11709,11 +11709,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) {
BI.RichEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
focus: function () { focus: function () {
this.editor.focus(); this.editor.focus();
}, },

3
dist/fineui.css vendored
Unescape View File

@ -3380,6 +3380,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

15
dist/fineui.js vendored
Unescape View File

@ -36851,6 +36851,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;
@ -56407,6 +56408,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },
@ -84431,11 +84441,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) {
BI.RichEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
focus: function () { focus: function () {
this.editor.focus(); this.editor.focus();
}, },

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

50
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/base/single/button/button.basic.js
Unescape View File

@ -238,6 +238,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
}, },
popup: { popup: {
type: "bi.text_bubble_bar_popup_view", type: "bi.text_bubble_bar_popup_view",
cls: "popup-content",
text: getBubble(), text: getBubble(),
ref: function () { ref: function () {
popup = this; popup = this;

9
src/base/single/label/label.js
Unescape View File

@ -427,6 +427,15 @@ BI.Label = BI.inherit(BI.Single, {
}); });
}, },
_setEnable: function (enable) {
BI.Label.superclass._setEnable.apply(this, arguments);
if (enable === true) {
this.element.removeClass("base-disabled disabled");
} else if (enable === false) {
this.element.addClass("base-disabled disabled");
}
},
doRedMark: function () { doRedMark: function () {
this.text.doRedMark.apply(this.text, arguments); this.text.doRedMark.apply(this.text, arguments);
}, },

5
src/case/richeditor/richeditor.js
Unescape View File

@ -79,11 +79,6 @@ BI.RichEditor = BI.inherit(BI.Widget, {
} }
}, },
_setEnable: function (enable) {
BI.RichEditor.superclass._setEnable.apply(this, arguments);
this.mask.setVisible(!enable);
},
focus: function () { focus: function () {
this.editor.focus(); this.editor.focus();
}, },

3
src/css/base/single/button/button.css
Unescape View File

@ -325,6 +325,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
filter: alpha(opacity=10); filter: alpha(opacity=10);
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.bi-basic-button .popup-content {
font-size: 14px;
}
.bi-theme-dark body .bi-button.button-common.ghost, .bi-theme-dark body .bi-button.button-common.ghost,
.bi-theme-dark #body .bi-button.button-common.ghost, .bi-theme-dark #body .bi-button.button-common.ghost,
.bi-theme-dark body .bi-button.button-common.ghost .b-font:before, .bi-theme-dark body .bi-button.button-common.ghost .b-font:before,

3
src/less/base/single/button/button.less
Unescape View File

@ -169,6 +169,9 @@ body .bi-button, #body .bi-button {
} }
} }
} }
& .popup-content{
font-size: @font-size-14;
}
} }
.bi-theme-dark { .bi-theme-dark {

Write Preview
Loading…
Cancel
Save