Title: [164312] trunk/Source/WebInspectorUI
- Revision
- 164312
- Author
- grao...@webkit.org
- Date
- 2014-02-18 13:44:52 -0800 (Tue, 18 Feb 2014)
Log Message
Web Inspector: editing a color in the Styles sidebar using the color picker only works once for a given color
https://bugs.webkit.org/show_bug.cgi?id=128965
Reviewed by Timothy Hatcher.
Use the WebInspector.TextMarker backing the CodeMirror TextMarker object to inspect its type in
order to identify color markers that were created for a color. This fixes a regression introduced
in http://webkit.org/b/125695 when we abstracted CodeMirror TextMarker objects.
* UserInterface/CSSStyleDeclarationTextEditor.js:
(WebInspector.CSSStyleDeclarationTextEditor.prototype._colorSwatchClicked.updateCodeMirror.update):
(WebInspector.CSSStyleDeclarationTextEditor.prototype._colorSwatchClicked.updateCodeMirror):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (164311 => 164312)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-02-18 21:41:11 UTC (rev 164311)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-02-18 21:44:52 UTC (rev 164312)
@@ -1,5 +1,20 @@
2014-02-18 Antoine Quint <grao...@webkit.org>
+ Web Inspector: editing a color in the Styles sidebar using the color picker only works once for a given color
+ https://bugs.webkit.org/show_bug.cgi?id=128965
+
+ Reviewed by Timothy Hatcher.
+
+ Use the WebInspector.TextMarker backing the CodeMirror TextMarker object to inspect its type in
+ order to identify color markers that were created for a color. This fixes a regression introduced
+ in http://webkit.org/b/125695 when we abstracted CodeMirror TextMarker objects.
+
+ * UserInterface/CSSStyleDeclarationTextEditor.js:
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._colorSwatchClicked.updateCodeMirror.update):
+ (WebInspector.CSSStyleDeclarationTextEditor.prototype._colorSwatchClicked.updateCodeMirror):
+
+2014-02-18 Antoine Quint <grao...@webkit.org>
+
Web Inspector: Editing transparent color shows incorrect opacity slider
https://bugs.webkit.org/show_bug.cgi?id=128975
Modified: trunk/Source/WebInspectorUI/UserInterface/CSSStyleDeclarationTextEditor.js (164311 => 164312)
--- trunk/Source/WebInspectorUI/UserInterface/CSSStyleDeclarationTextEditor.js 2014-02-18 21:41:11 UTC (rev 164311)
+++ trunk/Source/WebInspectorUI/UserInterface/CSSStyleDeclarationTextEditor.js 2014-02-18 21:44:52 UTC (rev 164312)
@@ -646,7 +646,7 @@
for (var i = 0; i < marks.length; ++i) {
var mark = marks[i];
- if (!mark.__markedColor)
+ if (WebInspector.TextMarker.textMarkerForCodeMirrorTextMarker(mark).type !== WebInspector.TextMarker.Type.Color)
continue;
colorTextMarker = mark;
break;
@@ -672,7 +672,6 @@
range.to.ch = range.from.ch + newColorText.length;
colorTextMarker = this._codeMirror.markText(range.from, range.to);
- colorTextMarker.__markedColor = true;
swatch.__colorTextMarker = colorTextMarker;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
