Modified: trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js (210519 => 210520)
--- trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js 2017-01-09 21:31:02 UTC (rev 210519)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/ColorPicker.js 2017-01-09 21:31:50 UTC (rev 210520)
@@ -41,49 +41,17 @@
this._opacitySlider.delegate = this;
this._opacitySlider.element.classList.add("opacity");
- let colorInputsContainerElement = document.createElement("div");
- colorInputsContainerElement.classList.add("color-inputs");
-
- function createColorInput(label, {min, max, step, units} = {min: 0, max: 1, step: 0.01}) {
- let containerElement = colorInputsContainerElement.createChild("div");
-
- containerElement.append(label);
-
- let numberInputElement = containerElement.createChild("input");
- numberInputElement.type = "number";
- numberInputElement.min = min;
- numberInputElement.max = max;
- numberInputElement.step = step;
- numberInputElement.addEventListener("input", this._handleColorInputInput.bind(this));
-
- if (units && units.length)
- containerElement.append(units);
-
- return {containerElement, numberInputElement};
- }
-
- this._colorInputs = new Map([
- ["R", createColorInput.call(this, "R", {max: 255, step: 1})],
- ["G", createColorInput.call(this, "G", {max: 255, step: 1})],
- ["B", createColorInput.call(this, "B", {max: 255, step: 1})],
- ["H", createColorInput.call(this, "H", {max: 360, step: 1})],
- ["S", createColorInput.call(this, "S", {units: "%"})],
- ["L", createColorInput.call(this, "L", {units: "%"})],
- ["A", createColorInput.call(this, "A")]
- ]);
-
this._element = document.createElement("div");
- this._element.classList.add("color-picker");
+ this._element.className = "color-picker";
this._element.appendChild(this._colorWheel.element);
this._element.appendChild(this._brightnessSlider.element);
this._element.appendChild(this._opacitySlider.element);
- this._element.appendChild(colorInputsContainerElement);
this._opacity = 0;
this._opacityPattern = "url(Images/Checkers.svg)";
- this._color = WebInspector.Color.fromString("white");
+ this._color = "white";
this._dontUpdateColor = false;
}
@@ -127,21 +95,16 @@
set color(color)
{
- if (!color)
- return;
-
this._dontUpdateColor = true;
- this._color = color;
+ this._colorFormat = color.format;
- this._colorWheel.tintedColor = this._color;
+ this._colorWheel.tintedColor = color;
this._brightnessSlider.value = this._colorWheel.brightness;
- this._opacitySlider.value = this._color.alpha;
- this._updateSliders(this._colorWheel.rawColor, this._color);
+ this._opacitySlider.value = color.alpha;
+ this._updateSliders(this._colorWheel.rawColor, color);
- this._showColorComponentInputs();
-
this._dontUpdateColor = false;
}
@@ -157,8 +120,6 @@
this.opacity = value;
else if (slider === this._brightnessSlider)
this.brightness = value;
-
- this._updateColor();
}
// Private
@@ -168,24 +129,15 @@
if (this._dontUpdateColor)
return;
- let opacity = Math.round(this._opacity * 100) / 100;
+ var opacity = Math.round(this._opacity * 100) / 100;
- let format = this._color.format;
- let components = null;
- if (format === WebInspector.Color.Format.HSL || format === WebInspector.Color.Format.HSLA) {
+ var components;
+ if (this._colorFormat === WebInspector.Color.Format.HSL || this._colorFormat === WebInspector.Color.Format.HSLA)
components = this._colorWheel.tintedColor.hsl.concat(opacity);
- if (opacity !== 1)
- format = WebInspector.Color.Format.HSLA;
- } else {
+ else
components = this._colorWheel.tintedColor.rgb.concat(opacity);
- if (opacity !== 1 && format === WebInspector.Color.Format.RGB)
- format = WebInspector.Color.Format.RGBA;
- }
- this._color = new WebInspector.Color(format, components);
-
- this._showColorComponentInputs();
-
+ this._color = new WebInspector.Color(this._colorFormat, components);
this.dispatchEventToListeners(WebInspector.ColorPicker.Event.ColorChanged, {color: this._color});
}
@@ -198,81 +150,6 @@
this._opacitySlider.element.style.backgroundImage = "linear-gradient(90deg, " + transparent + ", " + opaque + "), " + this._opacityPattern;
this._brightnessSlider.element.style.backgroundImage = "linear-gradient(90deg, black, " + rawColor + ")";
}
-
- _showColorComponentInputs()
- {
- function updateColorInput(key, value) {
- let {containerElement, numberInputElement} = this._colorInputs.get(key);
- numberInputElement.value = value;
- containerElement.hidden = false;
- }
-
- for (let {containerElement} of this._colorInputs.values())
- containerElement.hidden = true;
-
- switch (this._color.format) {
- case WebInspector.Color.Format.RGB:
- case WebInspector.Color.Format.RGBA:
- var [r, g, b] = this._color.rgb;
- updateColorInput.call(this, "R", r);
- updateColorInput.call(this, "G", g);
- updateColorInput.call(this, "B", b);
- break;
-
- case WebInspector.Color.Format.HSL:
- case WebInspector.Color.Format.HSLA:
- var [h, s, l] = this._color.hsl;
- updateColorInput.call(this, "H", h);
- updateColorInput.call(this, "S", s);
- updateColorInput.call(this, "L", l);
- break;
-
- default:
- return;
- }
-
- if (this._color.format === WebInspector.Color.Format.RGBA || this._color.format === WebInspector.Color.Format.HSLA)
- updateColorInput.call(this, "A", this._color.alpha);
- }
-
- _handleColorInputInput(event)
- {
- let r = this._colorInputs.get("R").numberInputElement.value;
- let g = this._colorInputs.get("G").numberInputElement.value;
- let b = this._colorInputs.get("B").numberInputElement.value;
- let h = this._colorInputs.get("H").numberInputElement.value;
- let s = this._colorInputs.get("S").numberInputElement.value;
- let l = this._colorInputs.get("L").numberInputElement.value;
- let a = this._colorInputs.get("A").numberInputElement.value;
-
- let colorString = "";
-
- switch (this._color.format) {
- case WebInspector.Color.Format.RGB:
- colorString = `rgb(${r}, ${g}, ${b})`;
- break;
-
- case WebInspector.Color.Format.RGBA:
- colorString = `rgba(${r}, ${g}, ${b}, ${a})`;
- break;
-
- case WebInspector.Color.Format.HSL:
- colorString = `hsl(${h}, ${s}%, ${l}%)`;
- break;
-
- case WebInspector.Color.Format.HSLA:
- colorString = `hsla(${h}, ${s}%, ${l}%, ${a})`;
- break;
-
- default:
- WebInspector.reportInternalError(`Input event fired for invalid color format "${this._color.format}"`);
- return;
- }
-
- this.color = WebInspector.Color.fromString(colorString);
-
- this.dispatchEventToListeners(WebInspector.ColorPicker.Event.ColorChanged, {color: this._color});
- }
};
WebInspector.ColorPicker.Event = {
