Page MenuHomePhabricator

D17930.diff
No OneTemporary

D17930.diff

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -13,7 +13,7 @@
'core.pkg.js' => '0f87a6eb',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => 'ea471cb0',
- 'differential.pkg.js' => '58457c19',
+ 'differential.pkg.js' => '4a466790',
'diffusion.pkg.css' => 'b93d9b8c',
'diffusion.pkg.js' => '84c8f8fd',
'favicon.ico' => '30672e08',
@@ -391,7 +391,7 @@
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375',
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
'rsrc/js/application/diff/DiffChangeset.js' => '68758d99',
- 'rsrc/js/application/diff/DiffChangesetList.js' => '204e4bfc',
+ 'rsrc/js/application/diff/DiffChangesetList.js' => '796922e0',
'rsrc/js/application/diff/DiffInline.js' => '1afe9760',
'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
'rsrc/js/application/differential/behavior-comment-preview.js' => 'b064af76',
@@ -778,7 +778,7 @@
'phabricator-darkmessage' => 'c48cccdd',
'phabricator-dashboard-css' => 'fe5b1869',
'phabricator-diff-changeset' => '68758d99',
- 'phabricator-diff-changeset-list' => '204e4bfc',
+ 'phabricator-diff-changeset-list' => '796922e0',
'phabricator-diff-inline' => '1afe9760',
'phabricator-drag-and-drop-file-upload' => '58dea2fa',
'phabricator-draggable-list' => 'bea6e7f4',
@@ -1066,9 +1066,6 @@
'javelin-install',
'javelin-dom',
),
- '204e4bfc' => array(
- 'javelin-install',
- ),
'21df4ff5' => array(
'javelin-install',
'javelin-workboard-card',
@@ -1496,6 +1493,9 @@
'javelin-behavior',
'javelin-quicksand',
),
+ '796922e0' => array(
+ 'javelin-install',
+ ),
'7a68dda3' => array(
'owners-path-editor',
'javelin-behavior',
diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js
--- a/webroot/rsrc/js/application/diff/DiffChangesetList.js
+++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js
@@ -968,11 +968,22 @@
var number = inline.getLineNumber();
var length = inline.getLineLength();
- var origin = JX.$(prefix + number);
- var target = JX.$(prefix + (number + length));
-
- this._hoverOrigin = origin;
- this._hoverTarget = target;
+ try {
+ var origin = JX.$(prefix + number);
+ var target = JX.$(prefix + (number + length));
+
+ this._hoverOrigin = origin;
+ this._hoverTarget = target;
+ } catch (error) {
+ // There may not be any nodes present in the document. A case where
+ // this occurs is when you reply to a ghost inline which was made
+ // on lines near the bottom of "long.txt" in an earlier diff, and
+ // the file was later shortened so those lines no longer exist. For
+ // more details, see T11662.
+
+ this._hoverOrigin = null;
+ this._hoverTarget = null;
+ }
} else {
this._hoverOrigin = null;
this._hoverTarget = null;

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 4, 3:07 PM (20 h, 26 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7086708
Default Alt Text
D17930.diff (3 KB)

Event Timeline