[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
ojan at chromium.org
ojan at chromium.org
Sun Feb 20 22:48:49 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit a6be9ec7bd447d4932c0661d910a4090b3c29f32
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 11 20:54:19 2011 +0000
2011-01-11 Ojan Vafai <ojan at chromium.org>
Reviewed by Mihai Parparita.
maintain word diffs when converting to side-by-side and back
https://bugs.webkit.org/show_bug.cgi?id=52244
Using textContent would lose the spans use to make the word-diff highlighting.
Just move the span element itself.
* code-review.js:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75538 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/bugs.webkit.org/ChangeLog b/Websites/bugs.webkit.org/ChangeLog
index e23f995..4c4e5bd 100644
--- a/Websites/bugs.webkit.org/ChangeLog
+++ b/Websites/bugs.webkit.org/ChangeLog
@@ -1,5 +1,17 @@
2011-01-11 Ojan Vafai <ojan at chromium.org>
+ Reviewed by Mihai Parparita.
+
+ maintain word diffs when converting to side-by-side and back
+ https://bugs.webkit.org/show_bug.cgi?id=52244
+
+ Using textContent would lose the spans use to make the word-diff highlighting.
+ Just move the span element itself.
+
+ * code-review.js:
+
+2011-01-11 Ojan Vafai <ojan at chromium.org>
+
Reviewed by Adam Barth.
fix layout error with comments in code review tool
diff --git a/Websites/bugs.webkit.org/code-review.js b/Websites/bugs.webkit.org/code-review.js
index 0da1a14..cad12e3 100644
--- a/Websites/bugs.webkit.org/code-review.js
+++ b/Websites/bugs.webkit.org/code-review.js
@@ -509,8 +509,8 @@
'</span><span class="to ' + lineNumberClassName + '">' + (to || ' ') +
'</span> <span class="text"></span>' +
'</div>');
- // Use text instead of innerHTML to avoid evaluting HTML.
- $('.text', line).text(contents);
+
+ $('.text', line).replaceWith(contents);
return line;
}
@@ -545,8 +545,7 @@
'</div>' +
'</div>');
- // Use text instead of innerHTML to avoid evaluting HTML.
- $('.text', line_side).text(contents);
+ $('.text', line_side).replaceWith(contents);
return line_side;
}
@@ -770,7 +769,7 @@
var convert_function = diff_type == 'sidebyside' ? sideBySideifyLine : unifyLine;
var from = fromLineNumber(line);
var to = toLineNumber(line);
- var contents = textContentsFor(line);
+ var contents = $('.text', line);
var classNames = classNamesForMovingLine(line);
var attributes = attributesForMovingLine(line);
var id = line.id;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list