Page MenuHomePhabricator
Files F15407585

D21252.diff
No OneTemporary
Actions

D21252.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
@@ -13,7 +13,7 @@
'core.pkg.js' => '0efaf0ac',
'dark-console.pkg.js' => '187792c2',
'differential.pkg.css' => 'b042ee8b',
- 'differential.pkg.js' => '4b2b5659',
+ 'differential.pkg.js' => '79dfae6e',
'diffusion.pkg.css' => '42c75c37',
'diffusion.pkg.js' => 'a98c0bf7',
'maniphest.pkg.css' => '35995d6d',
@@ -380,8 +380,8 @@
'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '1e413dc9',
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
'rsrc/js/application/diff/DiffChangeset.js' => 'b6bb0240',
- 'rsrc/js/application/diff/DiffChangesetList.js' => '2347e0a6',
- 'rsrc/js/application/diff/DiffInline.js' => '417b3cdb',
+ 'rsrc/js/application/diff/DiffChangesetList.js' => '1e8658bb',
+ 'rsrc/js/application/diff/DiffInline.js' => '9bb6f2ad',
'rsrc/js/application/diff/DiffPathView.js' => '8207abf9',
'rsrc/js/application/diff/DiffTreeView.js' => '5d83623b',
'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd',
@@ -775,8 +775,8 @@
'phabricator-darkmessage' => '26cd4b73',
'phabricator-dashboard-css' => '5a205b9d',
'phabricator-diff-changeset' => 'b6bb0240',
- 'phabricator-diff-changeset-list' => '2347e0a6',
- 'phabricator-diff-inline' => '417b3cdb',
+ 'phabricator-diff-changeset-list' => '1e8658bb',
+ 'phabricator-diff-inline' => '9bb6f2ad',
'phabricator-diff-path-view' => '8207abf9',
'phabricator-diff-tree-view' => '5d83623b',
'phabricator-drag-and-drop-file-upload' => '4370900d',
@@ -1069,6 +1069,11 @@
'javelin-behavior',
'javelin-dom',
),
+ '1e8658bb' => array(
+ 'javelin-install',
+ 'phuix-button-view',
+ 'phabricator-diff-tree-view',
+ ),
'1ff278aa' => array(
'phui-button-css',
),
@@ -1098,11 +1103,6 @@
'javelin-request',
'javelin-typeahead-source',
),
- '2347e0a6' => array(
- 'javelin-install',
- 'phuix-button-view',
- 'phabricator-diff-tree-view',
- ),
23631304 => array(
'phui-fontkit-css',
),
@@ -1251,9 +1251,6 @@
'javelin-behavior',
'javelin-uri',
),
- '417b3cdb' => array(
- 'javelin-dom',
- ),
'42c44e8b' => array(
'javelin-behavior',
'javelin-workflow',
@@ -1795,6 +1792,9 @@
'javelin-install',
'javelin-util',
),
+ '9bb6f2ad' => array(
+ 'javelin-dom',
+ ),
'9c01e364' => array(
'javelin-behavior',
'javelin-dom',
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
@@ -1403,8 +1403,8 @@
},
_newHoverMap: function(top, bot, content_cell, inline) {
- var start = inline.getStartOffset() || 0;
- var end = inline.getEndOffset() || 0;
+ var start = inline.getStartOffset();
+ var end = inline.getEndOffset();
var head_row = JX.DOM.findAbove(top, 'tr');
var last_row = JX.DOM.findAbove(bot, 'tr');
@@ -1476,13 +1476,13 @@
content = rows[ii].content;
len = content.length;
- if (ii === min) {
+ if (ii === min && (start !== null)) {
offset_min = start;
} else {
offset_min = 0;
}
- if (ii === max) {
+ if (ii === max && (end !== null)) {
offset_max = Math.min(end, len);
} else {
offset_max = len;
diff --git a/webroot/rsrc/js/application/diff/DiffInline.js b/webroot/rsrc/js/application/diff/DiffInline.js
--- a/webroot/rsrc/js/application/diff/DiffInline.js
+++ b/webroot/rsrc/js/application/diff/DiffInline.js
@@ -96,6 +96,7 @@
this._snippet = data.snippet;
this._menuItems = data.menuItems;
this._documentEngineKey = data.documentEngineKey;
+
this._startOffset = data.startOffset;
this._endOffset = data.endOffset;
@@ -167,8 +168,8 @@
this._isNewFile = data.isNewFile;
this._changesetID = data.changesetID;
this._isNew = true;
- this._startOffset = data.startOffset;
- this._endOffset = data.endOffset;
+ this._startOffset = null;
+ this._endOffset = null;
// Insert the comment after any other comments which already appear on
// the same row.

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 19, 6:28 PM (3 d, 13 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7682093
Default Alt Text
D21252.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility