Title: [102796] trunk/Websites/bugs.webkit.org
- Revision
- 102796
- Author
- [email protected]
- Date
- 2011-12-14 10:30:55 -0800 (Wed, 14 Dec 2011)
Log Message
Give a resize handle for sidebyside diffs.
https://bugs.webkit.org/show_bug.cgi?id=74465
Reviewed by Ryosuke Niwa.
This gives a drag handle so you can make the side-by-side
diff not be 50/50 on a per-file-diff basis. This is useful
for cases like new files where there's no value on the
left side.
* PrettyPatch/PrettyPatch.rb:
* code-review.js:
Modified Paths
Diff
Modified: trunk/Websites/bugs.webkit.org/ChangeLog (102795 => 102796)
--- trunk/Websites/bugs.webkit.org/ChangeLog 2011-12-14 18:14:42 UTC (rev 102795)
+++ trunk/Websites/bugs.webkit.org/ChangeLog 2011-12-14 18:30:55 UTC (rev 102796)
@@ -1,5 +1,20 @@
2011-12-13 Ojan Vafai <[email protected]>
+ Give a resize handle for sidebyside diffs.
+ https://bugs.webkit.org/show_bug.cgi?id=74465
+
+ Reviewed by Ryosuke Niwa.
+
+ This gives a drag handle so you can make the side-by-side
+ diff not be 50/50 on a per-file-diff basis. This is useful
+ for cases like new files where there's no value on the
+ left side.
+
+ * PrettyPatch/PrettyPatch.rb:
+ * code-review.js:
+
+2011-12-13 Ojan Vafai <[email protected]>
+
Expanding context is broken for prepare-ChangeLog in the code review tool.
https://bugs.webkit.org/show_bug.cgi?id=74458
Modified: trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb (102795 => 102796)
--- trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb 2011-12-14 18:14:42 UTC (rev 102795)
+++ trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb 2011-12-14 18:30:55 UTC (rev 102796)
@@ -141,6 +141,7 @@
border: 1px solid #ddd;
font-family: monospace;
margin: 1em 0;
+ position: relative;
}
h1 {
@@ -187,18 +188,28 @@
float: right;
}
-.LineSide:last-child {
- float: right;
-}
-
.LineSide,
.sidebyside .DiffBlockPart.remove,
.sidebyside .DiffBlockPart.add {
display:inline-block;
- width:50%;
+ width: 50%;
vertical-align: top;
}
+.sidebyside .resizeHandle {
+ width: 5px;
+ height: 100%;
+ cursor: move;
+ position: absolute;
+ top: 0;
+ left: 50%;
+}
+
+.sidebyside .resizeHandle:hover {
+ background-color: grey;
+ opacity: 0.5;
+}
+
.sidebyside .DiffBlockPart.remove .to,
.sidebyside .DiffBlockPart.add .from {
display: none;
Modified: trunk/Websites/bugs.webkit.org/code-review.js (102795 => 102796)
--- trunk/Websites/bugs.webkit.org/code-review.js 2011-12-14 18:14:42 UTC (rev 102795)
+++ trunk/Websites/bugs.webkit.org/code-review.js 2011-12-14 18:30:55 UTC (rev 102796)
@@ -63,6 +63,9 @@
if (!attachment_id)
console.log('No attachment ID');
+ var minLeftSideRatio = 10;
+ var maxLeftSideRatio = 90;
+ var file_diff_being_resized = null;
var next_line_id = 0;
var files = {};
var original_file_contents = {};
@@ -1139,6 +1142,7 @@
updateToolbarAnchorState();
loadDiffState();
+ generateFileDiffResizeStyleElement();
};
function handleReviewFormLoad() {
@@ -1223,6 +1227,9 @@
if (diffState(file_diff) == diff_type)
return;
+ if (!$('.resizeHandle', file_diff).length)
+ $(file_diff).append('<div class="resizeHandle"></div>');
+
$(file_diff).removeClass('sidebyside unified');
$(file_diff).addClass(diff_type);
@@ -1713,8 +1720,52 @@
return lineOffsetFrom(line, 1);
}
- $(document.body).bind('mouseup', processSelectedLines);
+ $('.resizeHandle').live('mousedown', function(event) {
+ file_diff_being_resized = $(this).parent('.FileDiff');
+ });
+ function generateFileDiffResizeStyleElement() {
+ // FIXME: Once we support calc, we can replace this with something that uses the attribute value.
+ var styleText = '';
+ for (var i = minLeftSideRatio; i <= maxLeftSideRatio; i++) {
+ // FIXME: Once we support calc, put the resize handle at calc(i% - 5) so it doesn't cover up
+ // the right-side line numbers.
+ styleText += '.FileDiff[leftsidewidth="' + i + '"] .resizeHandle {' +
+ 'left: ' + i + '%' +
+ '}' +
+ '.FileDiff[leftsidewidth="' + i + '"] .LineSide:first-child,' +
+ '.FileDiff[leftsidewidth="' + i + '"].sidebyside .DiffBlockPart.remove {' +
+ 'width:' + i + '%;' +
+ '}' +
+ '.FileDiff[leftsidewidth="' + i + '"] .LineSide:last-child,' +
+ '.FileDiff[leftsidewidth="' + i + '"].sidebyside .DiffBlockPart.add {' +
+ 'width:' + (100 - i) + '%;' +
+ '}';
+ }
+ var styleElement = document.createElement('style');
+ styleElement.innerText = styleText;
+ document.head.appendChild(styleElement);
+ }
+
+ $(document).bind('mousemove', function(event) {
+ if (!file_diff_being_resized)
+ return;
+
+ var ratio = event.pageX / window.innerWidth;
+ var percentage = Math.floor(ratio * 100);
+ if (percentage < minLeftSideRatio)
+ percentage = minLeftSideRatio;
+ if (percentage > maxLeftSideRatio)
+ percentage = maxLeftSideRatio;
+ file_diff_being_resized.attr('leftsidewidth', percentage);
+ event.preventDefault();
+ });
+
+ $(document).bind('mouseup', function(event) {
+ file_diff_being_resized = null;
+ processSelectedLines();
+ });
+
$('.lineNumber').live('click', function(e) {
var line = lineFromLineDescendant($(this));
if (line.hasClass('commentContext'))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
