Page MenuHomePhabricator
Files F18284059

D8686.id20599.diff
No OneTemporary
Actions

D8686.id20599.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,9 +8,9 @@
'names' =>
array(
'core.pkg.css' => 'fb144113',
- 'core.pkg.js' => 'd3fecc57',
+ 'core.pkg.js' => 'c1649c0c',
'darkconsole.pkg.js' => 'ca8671ce',
- 'differential.pkg.css' => 'cc216438',
+ 'differential.pkg.css' => '331c38d9',
'differential.pkg.js' => '11a5b750',
'diffusion.pkg.css' => '3783278d',
'diffusion.pkg.js' => '5b4010f4',
@@ -55,7 +55,7 @@
'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
'rsrc/css/application/diff/inline-comment-summary.css' => '14a91639',
'rsrc/css/application/differential/add-comment.css' => 'c478bcaa',
- 'rsrc/css/application/differential/changeset-view.css' => 'd1951f43',
+ 'rsrc/css/application/differential/changeset-view.css' => 'df93fa84',
'rsrc/css/application/differential/core.css' => '7ac3cabc',
'rsrc/css/application/differential/results-table.css' => '239924f9',
'rsrc/css/application/differential/revision-comment.css' => '48186045',
@@ -463,7 +463,7 @@
'rsrc/js/core/behavior-line-linker.js' => 'bc778103',
'rsrc/js/core/behavior-more.js' => '9b9197be',
'rsrc/js/core/behavior-object-selector.js' => 'b4eef37b',
- 'rsrc/js/core/behavior-oncopy.js' => 'dab9253e',
+ 'rsrc/js/core/behavior-oncopy.js' => '03559a86',
'rsrc/js/core/behavior-phabricator-nav.js' => 'b5842a5e',
'rsrc/js/core/behavior-phabricator-remarkup-assist.js' => 'c021950a',
'rsrc/js/core/behavior-refresh-csrf.js' => 'c4b31646',
@@ -505,7 +505,7 @@
'conpherence-notification-css' => '403cf598',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '87b12e0c',
- 'differential-changeset-view-css' => 'd1951f43',
+ 'differential-changeset-view-css' => 'df93fa84',
'differential-core-view-css' => '7ac3cabc',
'differential-inline-comment-editor' => 'f2441746',
'differential-results-table-css' => '239924f9',
@@ -596,7 +596,7 @@
'javelin-behavior-phabricator-nav' => 'b5842a5e',
'javelin-behavior-phabricator-notification-example' => 'c51a6616',
'javelin-behavior-phabricator-object-selector' => 'b4eef37b',
- 'javelin-behavior-phabricator-oncopy' => 'dab9253e',
+ 'javelin-behavior-phabricator-oncopy' => '03559a86',
'javelin-behavior-phabricator-remarkup-assist' => 'c021950a',
'javelin-behavior-phabricator-reveal-content' => '8f24abfc',
'javelin-behavior-phabricator-search-typeahead' => 'f6b56f7a',
@@ -833,6 +833,11 @@
8 => 'javelin-stratcom',
9 => 'javelin-util',
),
+ '03559a86' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-dom',
+ ),
'03d6ed07' =>
array(
0 => 'javelin-behavior',
@@ -1216,6 +1221,11 @@
2 => 'javelin-util',
3 => 'phabricator-shaped-request',
),
+ '7319e029' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-dom',
+ ),
'62e18640' =>
array(
0 => 'javelin-install',
@@ -1251,11 +1261,6 @@
1 => 'javelin-stratcom',
2 => 'javelin-dom',
),
- '7319e029' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-dom',
- ),
'75903ee1' =>
array(
0 => 'javelin-behavior',
@@ -1768,11 +1773,6 @@
1 => 'javelin-util',
2 => 'javelin-stratcom',
),
- 'dab9253e' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-dom',
- ),
'dd7e8ef5' =>
array(
0 => 'javelin-behavior',
diff --git a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
@@ -31,6 +31,15 @@
}
$html = array();
+ $html[] = phutil_tag('colgroup', array(), array(
+ phutil_tag('col', array('class' => 'num')),
+ phutil_tag('col', array('class' => 'left')),
+ phutil_tag('col', array('class' => 'num')),
+ phutil_tag('col', array('class' => 'copy')),
+ phutil_tag('col', array('class' => 'right')),
+ phutil_tag('col', array('class' => 'cov')),
+ ));
+
$old_lines = $this->getOldLines();
$new_lines = $this->getNewLines();
$gaps = $this->getGaps();
@@ -283,10 +292,11 @@
$n_id = null;
}
- // NOTE: This is a unicode zero-width space, which we use as a hint
- // when intercepting 'copy' events to make sure sensible text ends
- // up on the clipboard. See the 'phabricator-oncopy' behavior.
- $zero_space = "\xE2\x80\x8B";
+ // NOTE: This is a unicode 'word joiner' (essentially a non-breaking
+ // zero-width space), which we use as a hint when intercepting 'copy'
+ // events to make sure sensible text ends up on the clipboard.
+ // See the 'phabricator-oncopy' behavior.
+ $zero_space = "\xE2\x81\xA0";
// NOTE: The Javascript is sensitive to whitespace changes in this
// block!
diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css
--- a/webroot/rsrc/css/application/differential/changeset-view.css
+++ b/webroot/rsrc/css/application/differential/changeset-view.css
@@ -16,12 +16,30 @@
.differential-diff {
background: #fff;
width: 100%;
+ min-width: 780px;
border-top: 1px solid {$lightblueborder};
border-bottom: 1px solid {$lightblueborder};
+ table-layout: fixed;
+}
+
+.differential-diff col.num {
+ width: 45px;
+}
+
+.differential-diff col.left,
+.differential-diff col.right {
+ width: 49.25%;
+}
+
+.differential-diff col.copy {
+ width: 0.5%;
+}
+
+.differential-diff col.cov {
+ width: 1%;
}
.differential-diff td {
- min-width: 320px;
/*
Disable ligatures in Firefox. Firefox 3 has fancypants ligature support, but
it gets applied to monospaced fonts, which sucks because it means that the
@@ -35,6 +53,7 @@
letter-spacing: 0.0083334px;
vertical-align: top;
white-space: pre-wrap;
+ word-wrap: break-word;
padding: 0 8px 1px;
line-height: 16px;
}
@@ -42,9 +61,6 @@
.differential-diff th {
text-align: right;
padding: 2px 6px 0px 0px;
- width: 4%;
- min-width: 45px;
- max-width: 4%;
vertical-align: top;
background: {$lightbluebackground};
color: {$bluetext};
@@ -59,21 +75,6 @@
-ms-user-select: none;
user-select: none;
}
-.differential-diff td.left {
- width: 45%;
-}
-
-.differential-diff td.right,
-.differential-diff td.right1 {
- width: 43.5%;
-}
-
-.differential-diff td.right2 {
- width: 44.5%;
-}
-.differential-diff td.right3 {
- width: 45%;
-}
.differential-changeset-immutable .differential-diff th {
cursor: auto;
@@ -126,8 +127,6 @@
}
.differential-diff td.cov {
- min-width: 1%;
- width: 1%;
padding: 0;
}
@@ -252,6 +251,7 @@
width: 100%;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
+ box-sizing: border-box;
overflow: hidden;
white-space: normal;
}
diff --git a/webroot/rsrc/js/core/behavior-oncopy.js b/webroot/rsrc/js/core/behavior-oncopy.js
--- a/webroot/rsrc/js/core/behavior-oncopy.js
+++ b/webroot/rsrc/js/core/behavior-oncopy.js
@@ -16,7 +16,7 @@
*/
JX.behavior('phabricator-oncopy', function() {
- var zws = "\u200B"; // Unicode Zero-Width Space
+ var zws = "\u2060"; // Unicode Word Joiner (Non-Breaking Zero-Width Space)
document.body.oncopy = function(e) {

File Metadata

Mime Type
text/plain
Expires
Aug 24 2025, 2:30 AM (7 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
9631982
Default Alt Text
D8686.id20599.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility