Title: [113437] trunk/Source/WebCore
- Revision
- 113437
- Author
- [email protected]
- Date
- 2012-04-06 08:17:50 -0700 (Fri, 06 Apr 2012)
Log Message
Web Inspector: highlight diff in the gutter, not in the line content.
https://bugs.webkit.org/show_bug.cgi?id=83371
Reviewed by Yury Semikhatsky.
Now that the editing mode is enabled by default, diff highlighting gets annoying.
I am moving it to the gutter (same decoration as before, but now coloring gutter only).
* inspector/front-end/TextViewer.js:
(WebInspector.TextEditorGutterPanel.prototype.textChanged):
* inspector/front-end/textViewer.css:
(.diff-container .webkit-added-line.webkit-line-number):
(.diff-container .webkit-removed-line.webkit-line-number):
(.diff-container .webkit-changed-line.webkit-line-number):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (113436 => 113437)
--- trunk/Source/WebCore/ChangeLog 2012-04-06 15:08:47 UTC (rev 113436)
+++ trunk/Source/WebCore/ChangeLog 2012-04-06 15:17:50 UTC (rev 113437)
@@ -1,5 +1,22 @@
2012-04-06 Pavel Feldman <[email protected]>
+ Web Inspector: highlight diff in the gutter, not in the line content.
+ https://bugs.webkit.org/show_bug.cgi?id=83371
+
+ Reviewed by Yury Semikhatsky.
+
+ Now that the editing mode is enabled by default, diff highlighting gets annoying.
+ I am moving it to the gutter (same decoration as before, but now coloring gutter only).
+
+ * inspector/front-end/TextViewer.js:
+ (WebInspector.TextEditorGutterPanel.prototype.textChanged):
+ * inspector/front-end/textViewer.css:
+ (.diff-container .webkit-added-line.webkit-line-number):
+ (.diff-container .webkit-removed-line.webkit-line-number):
+ (.diff-container .webkit-changed-line.webkit-line-number):
+
+2012-04-06 Pavel Feldman <[email protected]>
+
Web Inspector: remove url from the saved urls map before the save action.
https://bugs.webkit.org/show_bug.cgi?id=83364
Modified: trunk/Source/WebCore/inspector/front-end/TextViewer.js (113436 => 113437)
--- trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-06 15:08:47 UTC (rev 113436)
+++ trunk/Source/WebCore/inspector/front-end/TextViewer.js 2012-04-06 15:17:50 UTC (rev 113437)
@@ -690,6 +690,9 @@
// Do not move decorations before the start position.
if (lineNumber < oldRange.startLine)
continue;
+ // Decorations follow the first character of line.
+ if (lineNumber === oldRange.startLine && oldRange.startColumn)
+ continue;
var lineDecorationsCopy = this._decorations[lineNumber].slice();
for (var i = 0; i < lineDecorationsCopy.length; ++i) {
Modified: trunk/Source/WebCore/inspector/front-end/textViewer.css (113436 => 113437)
--- trunk/Source/WebCore/inspector/front-end/textViewer.css 2012-04-06 15:08:47 UTC (rev 113436)
+++ trunk/Source/WebCore/inspector/front-end/textViewer.css 2012-04-06 15:17:50 UTC (rev 113437)
@@ -175,17 +175,19 @@
outline: 1px solid rgb(64, 115, 244);
}
-.diff-container .webkit-added-line.webkit-line-content {
- background-color: rgb(220, 255, 220);
+.diff-container .webkit-added-line.webkit-line-number {
+ background-color: rgb(170, 255, 170);
+ color: #333;
}
-.diff-container .webkit-removed-line.webkit-line-content {
+.diff-container .webkit-removed-line.webkit-line-number {
background-color: rgb(255, 220, 220);
text-decoration: line-through;
}
-.diff-container .webkit-changed-line.webkit-line-content {
- background-color: rgb(220, 220, 255);
+.diff-container .webkit-changed-line.webkit-line-number {
+ background-color: rgb(170, 170, 255);
+ color: #333;
}
.webkit-highlighted-line.webkit-line-content {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
