Page MenuHomePhabricator
Files F13817095

D21148.diff
No OneTemporary
Actions

D21148.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
@@ -12,7 +12,7 @@
'core.pkg.css' => 'a4a2417c',
'core.pkg.js' => '4355a8d3',
'differential.pkg.css' => '607c84be',
- 'differential.pkg.js' => 'ececaeef',
+ 'differential.pkg.js' => '1a72918e',
'diffusion.pkg.css' => '42c75c37',
'diffusion.pkg.js' => 'a98c0bf7',
'maniphest.pkg.css' => '35995d6d',
@@ -378,7 +378,7 @@
'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' => '5a4e4a3b',
- 'rsrc/js/application/diff/DiffChangesetList.js' => 'f813ef26',
+ 'rsrc/js/application/diff/DiffChangesetList.js' => '139299d7',
'rsrc/js/application/diff/DiffInline.js' => '16e97ebc',
'rsrc/js/application/diff/behavior-preview-link.js' => 'f51e9c17',
'rsrc/js/application/differential/behavior-diff-radios.js' => '925fe8cd',
@@ -775,7 +775,7 @@
'phabricator-darkmessage' => '26cd4b73',
'phabricator-dashboard-css' => '5a205b9d',
'phabricator-diff-changeset' => '5a4e4a3b',
- 'phabricator-diff-changeset-list' => 'f813ef26',
+ 'phabricator-diff-changeset-list' => '139299d7',
'phabricator-diff-inline' => '16e97ebc',
'phabricator-drag-and-drop-file-upload' => '4370900d',
'phabricator-draggable-list' => '0169e425',
@@ -1023,6 +1023,10 @@
'javelin-uri',
'phabricator-keyboard-shortcut',
),
+ '139299d7' => array(
+ 'javelin-install',
+ 'phuix-button-view',
+ ),
'139ef688' => array(
'javelin-behavior',
'javelin-dom',
@@ -2166,10 +2170,6 @@
'javelin-stratcom',
'javelin-dom',
),
- 'f813ef26' => array(
- 'javelin-install',
- 'phuix-button-view',
- ),
'f84bcbf4' => array(
'javelin-behavior',
'javelin-stratcom',
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
@@ -462,23 +462,28 @@
var pht = this.getTranslations();
var cursor = this._cursorItem;
+ var changeset;
if (cursor) {
- if (cursor.type == 'file') {
- var changeset = cursor.changeset;
- var editor_uri = changeset.getEditorURI();
+ changeset = cursor.changeset;
+ }
- if (editor_uri === null) {
- this._warnUser(pht('No external editor is configured.'));
- return;
- }
+ if (!changeset) {
+ changeset = this._getVisibleChangeset();
+ }
+
+ if (!changeset) {
+ this._warnUser(pht('You must select a file to edit.'));
+ return;
+ }
- JX.$U(editor_uri).go();
+ var editor_uri = changeset.getEditorURI();
- return;
- }
+ if (editor_uri === null) {
+ this._warnUser(pht('No external editor is configured.'));
+ return;
}
- this._warnUser(pht('You must select a file to edit.'));
+ JX.$U(editor_uri).go();
},
_onkeycollapse: function() {

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 10:18 PM (18 h, 40 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6624265
Default Alt Text
D21148.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility