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

* commit '8495459cf7f8acdf5177ece0c900cee5d863d86a': BI-23830
6 years ago · 404084cb1b
7 changed files with 11 additions and 11 deletions
--- a/dist/_fineui.min.js
+++ b/dist/_fineui.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -77145,7 +77145,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
    },

    getValue: function () {
-        if (this.transparent.isSelected()) {
+        if (this._isEmptyRGB() && this.transparent.isSelected()) {
            return "transparent";
        }
        return BI.DOM.rgb2hex(BI.DOM.json2rgb({
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -4655,7 +4655,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
    },

    getValue: function () {
-        if (this.transparent.isSelected()) {
+        if (this._isEmptyRGB() && this.transparent.isSelected()) {
            return "transparent";
        }
        return BI.DOM.rgb2hex(BI.DOM.json2rgb({
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -77388,7 +77388,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
    },

    getValue: function () {
-        if (this.transparent.isSelected()) {
+        if (this._isEmptyRGB() && this.transparent.isSelected()) {
            return "transparent";
        }
        return BI.DOM.rgb2hex(BI.DOM.json2rgb({
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.js
@ -214,7 +214,7 @@ BI.ColorPickerEditor = BI.inherit(BI.Widget, {
    },

    getValue: function () {
-        if (this.transparent.isSelected()) {
+        if (this._isEmptyRGB() && this.transparent.isSelected()) {
            return "transparent";
        }
        return BI.DOM.rgb2hex(BI.DOM.json2rgb({