Skip to content

Commit 3635a11

Browse files
author
epriestley
committedMay 22, 2020
When cancelling an edit of an inline with content, don't hide the inline
Summary: See PHI1753. This condition got rewritten for suggested edits and accidentally inverted. Test Plan: - Create a comment, type text, save draft, edit comment, cancel. - Before: comment hides itself. - After: comment properly cancels into pre-edit draft state. Differential Revision: https://secure.phabricator.com/D21286
1 parent 959a835 commit 3635a11

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed
 

‎resources/celerity/map.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'core.pkg.js' => '845355f4',
1414
'dark-console.pkg.js' => '187792c2',
1515
'differential.pkg.css' => '5c459f92',
16-
'differential.pkg.js' => '2b4a7014',
16+
'differential.pkg.js' => '218fda21',
1717
'diffusion.pkg.css' => '42c75c37',
1818
'diffusion.pkg.js' => 'a98c0bf7',
1919
'maniphest.pkg.css' => '35995d6d',
@@ -381,7 +381,7 @@
381381
'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => '0116d3e8',
382382
'rsrc/js/application/diff/DiffChangeset.js' => '39dcf2c3',
383383
'rsrc/js/application/diff/DiffChangesetList.js' => 'cc2c5de5',
384-
'rsrc/js/application/diff/DiffInline.js' => '008b6a15',
384+
'rsrc/js/application/diff/DiffInline.js' => '511a1315',
385385
'rsrc/js/application/diff/DiffPathView.js' => '8207abf9',
386386
'rsrc/js/application/diff/DiffTreeView.js' => '5d83623b',
387387
'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd',
@@ -778,7 +778,7 @@
778778
'phabricator-dashboard-css' => '5a205b9d',
779779
'phabricator-diff-changeset' => '39dcf2c3',
780780
'phabricator-diff-changeset-list' => 'cc2c5de5',
781-
'phabricator-diff-inline' => '008b6a15',
781+
'phabricator-diff-inline' => '511a1315',
782782
'phabricator-diff-path-view' => '8207abf9',
783783
'phabricator-diff-tree-view' => '5d83623b',
784784
'phabricator-drag-and-drop-file-upload' => '4370900d',
@@ -919,9 +919,6 @@
919919
'unhandled-exception-css' => '9ecfc00d',
920920
),
921921
'requires' => array(
922-
'008b6a15' => array(
923-
'javelin-dom',
924-
),
925922
'0116d3e8' => array(
926923
'javelin-behavior',
927924
'javelin-dom',
@@ -1397,6 +1394,9 @@
13971394
'javelin-stratcom',
13981395
'javelin-dom',
13991396
),
1397+
'511a1315' => array(
1398+
'javelin-dom',
1399+
),
14001400
'5202e831' => array(
14011401
'javelin-install',
14021402
'javelin-dom',

‎webroot/rsrc/js/application/diff/DiffInline.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ JX.install('DiffInline', {
863863

864864
// If this was an empty box and we typed some text and then hit cancel,
865865
// don't show the empty concrete inline.
866-
if (!this._isVoidContentState(this._originalState)) {
866+
if (this._isVoidContentState(this._originalState)) {
867867
this.setInvisible(true);
868868
} else {
869869
this.setInvisible(false);

0 commit comments

Comments
 (0)
Failed to load comments.