@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
When a user cancels a new inline, clear it from the objective list
Summary: Ref T12733. Currently, creating a new inline and then canceling it leaves a marker in the objective list. Instead, remove the marker.
Test Plan:
- Created an empty inline, cancelled. Created a non-empty inline, cancelled. No objective marker in either case.
- Created a new normal inline, objective marker.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12733
Differential Revision: https://secure.phabricator.com/D17979
+17
-6
+6
-6
resources/celerity/map.php
+6
-6
resources/celerity/map.php
···
13
13
'core.pkg.js' => '599698a7',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '7d4cfa59',
16
-
'differential.pkg.js' => 'fc6a23eb',
16
+
'differential.pkg.js' => 'd7e3edd5',
17
17
'diffusion.pkg.css' => 'b93d9b8c',
18
18
'diffusion.pkg.js' => '84c8f8fd',
19
19
'favicon.ico' => '30672e08',
···
392
392
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63',
393
393
'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
394
394
'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
395
-
'rsrc/js/application/diff/DiffInline.js' => '93cbb03f',
395
+
'rsrc/js/application/diff/DiffInline.js' => 'ca0fafde',
396
396
'rsrc/js/application/diff/ScrollObjective.js' => '9df4e4e2',
397
397
'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
398
398
'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
···
779
779
'phabricator-dashboard-css' => 'fe5b1869',
780
780
'phabricator-diff-changeset' => 'cf4e2140',
781
781
'phabricator-diff-changeset-list' => 'a716ca27',
782
-
'phabricator-diff-inline' => '93cbb03f',
782
+
'phabricator-diff-inline' => 'ca0fafde',
783
783
'phabricator-drag-and-drop-file-upload' => '58dea2fa',
784
784
'phabricator-draggable-list' => 'bea6e7f4',
785
785
'phabricator-fatal-config-template-css' => '8f18fa41',
···
1604
1604
'javelin-stratcom',
1605
1605
'javelin-dom',
1606
1606
),
1607
-
'93cbb03f' => array(
1608
-
'javelin-dom',
1609
-
),
1610
1607
'93d0c9e3' => array(
1611
1608
'javelin-behavior',
1612
1609
'javelin-stratcom',
···
1978
1975
'phabricator-title',
1979
1976
'phabricator-shaped-request',
1980
1977
'conpherence-thread-manager',
1978
+
),
1979
+
'ca0fafde' => array(
1980
+
'javelin-dom',
1981
1981
),
1982
1982
'caade6f2' => array(
1983
1983
'javelin-behavior',
+11
webroot/rsrc/js/application/diff/DiffInline.js
+11
webroot/rsrc/js/application/diff/DiffInline.js
···
33
33
_isDraft: null,
34
34
_isFixed: null,
35
35
_isEditing: false,
36
+
_isNew: false,
36
37
37
38
bindToRow: function(row) {
38
39
this._row = row;
···
73
74
this._isGhost = data.isGhost;
74
75
75
76
this._changesetID = data.changesetID;
77
+
this._isNew = false;
76
78
77
79
this.setInvisible(false);
78
80
···
87
89
this._length = parseInt(data.length, 10);
88
90
this._isNewFile = data.isNewFile;
89
91
this._changesetID = data.changesetID;
92
+
this._isNew = true;
90
93
91
94
// Insert the comment after any other comments which already appear on
92
95
// the same row.
···
110
113
this._length = inline._length;
111
114
this._isNewFile = inline._isNewFile;
112
115
this._changesetID = inline._changesetID;
116
+
this._isNew = true;
113
117
114
118
this._replyToCommentPHID = inline._phid;
115
119
···
194
198
var objective = this._objective;
195
199
196
200
if (this.isHidden() || this._isDeleted) {
201
+
objective.hide();
202
+
return;
203
+
}
204
+
205
+
// If this is a new comment which we aren't editing, don't show anything:
206
+
// the use started a comment or reply, then cancelled it.
207
+
if (this._isNew && !this._isEditing) {
197
208
objective.hide();
198
209
return;
199
210
}