Page MenuHomePhabricator
Files F14083787

D17978.diff
No OneTemporary
Actions

D17978.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' => '599698a7',
'darkconsole.pkg.js' => '1f9a31bc',
'differential.pkg.css' => '7d4cfa59',
- 'differential.pkg.js' => 'f94e941c',
+ 'differential.pkg.js' => 'fc6a23eb',
'diffusion.pkg.css' => 'b93d9b8c',
'diffusion.pkg.js' => '84c8f8fd',
'favicon.ico' => '30672e08',
@@ -392,8 +392,8 @@
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
- 'rsrc/js/application/diff/DiffInline.js' => 'fa07d36e',
- 'rsrc/js/application/diff/ScrollObjective.js' => '2e069f79',
+ 'rsrc/js/application/diff/DiffInline.js' => '93cbb03f',
+ 'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -779,7 +779,7 @@
'phabricator-dashboard-css' => 'fe5b1869',
'phabricator-diff-changeset' => 'cf4e2140',
'phabricator-diff-changeset-list' => 'a716ca27',
- 'phabricator-diff-inline' => 'fa07d36e',
+ 'phabricator-diff-inline' => '93cbb03f',
'phabricator-drag-and-drop-file-upload' => '58dea2fa',
'phabricator-draggable-list' => 'bea6e7f4',
'phabricator-fatal-config-template-css' => '8f18fa41',
@@ -799,7 +799,7 @@
'phabricator-phtize' => 'd254d646',
'phabricator-prefab' => 'c5af80a2',
'phabricator-remarkup-css' => 'd1a5e11e',
- 'phabricator-scroll-objective' => '2e069f79',
+ 'phabricator-scroll-objective' => '9df4e4e2',
'phabricator-scroll-objective-list' => '085dd101',
'phabricator-search-results-css' => 'f87d23ad',
'phabricator-shaped-request' => '7cbe244b',
@@ -1113,13 +1113,6 @@
'javelin-install',
'javelin-event',
),
- '2e069f79' => array(
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-install',
- 'javelin-workflow',
- ),
'2ee659ce' => array(
'javelin-install',
),
@@ -1611,6 +1604,9 @@
'javelin-stratcom',
'javelin-dom',
),
+ '93cbb03f' => array(
+ 'javelin-dom',
+ ),
'93d0c9e3' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -1675,6 +1671,13 @@
'9d9685d6' => array(
'phui-oi-list-view-css',
),
+ '9df4e4e2' => array(
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-install',
+ 'javelin-workflow',
+ ),
'9f36c42d' => array(
'javelin-behavior',
'javelin-stratcom',
@@ -2206,9 +2209,6 @@
'javelin-install',
'javelin-dom',
),
- 'fa07d36e' => array(
- 'javelin-dom',
- ),
'fbe497e7' => array(
'javelin-behavior',
'javelin-util',
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
@@ -74,9 +74,10 @@
this._changesetID = data.changesetID;
- this.updateObjective();
this.setInvisible(false);
+ this.updateObjective();
+
return this;
},
@@ -166,9 +167,11 @@
this._changeset = changeset;
var objectives = changeset.getChangesetList().getObjectives();
+
+ // Create this inline's objective, but don't show it yet.
this._objective = objectives.newObjective()
- .setCallback(JX.bind(this, this._onobjective));
- this.updateObjective();
+ .setCallback(JX.bind(this, this._onobjective))
+ .hide();
return this;
},
@@ -206,11 +209,17 @@
var icon = 'fa-comment';
var color = 'bluegrey';
var tooltip = null;
+ var anchor = this._row;
if (this._isEditing) {
icon = 'fa-star';
color = 'pink';
tooltip = pht('Editing Comment');
+
+ // If we're editing, anchor to the row with the editor instead of the
+ // actual comment row (which is invisible and can have a misleading
+ // position).
+ anchor = this._row.nextSibling;
} else if (this._isDraft) {
// This inline is an unsubmitted draft.
icon = 'fa-pencil';
@@ -225,6 +234,7 @@
}
objective
+ .setAnchor(anchor)
.setIcon(icon)
.setColor(color)
.setTooltip(tooltip)
diff --git a/webroot/rsrc/js/application/diff/ScrollObjective.js b/webroot/rsrc/js/application/diff/ScrollObjective.js
--- a/webroot/rsrc/js/application/diff/ScrollObjective.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjective.js
@@ -111,6 +111,7 @@
hide: function() {
this._visible = false;
+ return this;
},
isVisible: function() {

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 5:27 AM (18 h, 24 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6780294
Default Alt Text
D17978.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility