From 79f7dd457ea4e220f9341f7f3f969a00ced99b6b Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 8 Jul 2013 19:56:40 -0700 Subject: [PATCH] See https://github.com/facebook/phabricator/issues/262 --- src/__celerity_resource_map__.php | 46 +++++++++---------- .../differential/behavior-dropdown-menus.js | 3 +- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index e56d3f55c7..02a846c56e 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1481,7 +1481,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-differential-dropdown-menus' => array( - 'uri' => '/res/f04cf682/rsrc/js/application/differential/behavior-dropdown-menus.js', + 'uri' => '/res/722c679c/rsrc/js/application/differential/behavior-dropdown-menus.js', 'type' => 'js', 'requires' => array( @@ -4265,7 +4265,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/dd27a69b/differential.pkg.css', 'type' => 'css', ), - '9488bb69' => + '4ad86dee' => array( 'name' => 'differential.pkg.js', 'symbols' => @@ -4291,7 +4291,7 @@ celerity_register_resource_map(array( 18 => 'javelin-behavior-differential-toggle-files', 19 => 'javelin-behavior-differential-user-select', ), - 'uri' => '/res/pkg/9488bb69/differential.pkg.js', + 'uri' => '/res/pkg/4ad86dee/differential.pkg.js', 'type' => 'js', ), 'c8ce2d88' => @@ -4389,7 +4389,7 @@ celerity_register_resource_map(array( 'aphront-typeahead-control-css' => '178f5351', 'differential-changeset-view-css' => 'dd27a69b', 'differential-core-view-css' => 'dd27a69b', - 'differential-inline-comment-editor' => '9488bb69', + 'differential-inline-comment-editor' => '4ad86dee', 'differential-local-commits-view-css' => 'dd27a69b', 'differential-results-table-css' => 'dd27a69b', 'differential-revision-add-comment-css' => 'dd27a69b', @@ -4407,24 +4407,24 @@ celerity_register_resource_map(array( 'javelin-behavior-aphlict-dropdown' => '75ccea43', 'javelin-behavior-aphlict-listen' => '75ccea43', 'javelin-behavior-aphront-basic-tokenizer' => '75ccea43', - 'javelin-behavior-aphront-drag-and-drop' => '9488bb69', - 'javelin-behavior-aphront-drag-and-drop-textarea' => '9488bb69', + 'javelin-behavior-aphront-drag-and-drop' => '4ad86dee', + 'javelin-behavior-aphront-drag-and-drop-textarea' => '4ad86dee', 'javelin-behavior-aphront-form-disable-on-submit' => '75ccea43', 'javelin-behavior-audit-preview' => '96909266', 'javelin-behavior-dark-console' => '4ccfeb47', 'javelin-behavior-device' => '75ccea43', - 'javelin-behavior-differential-accept-with-errors' => '9488bb69', - 'javelin-behavior-differential-add-reviewers-and-ccs' => '9488bb69', - 'javelin-behavior-differential-comment-jump' => '9488bb69', - 'javelin-behavior-differential-diff-radios' => '9488bb69', - 'javelin-behavior-differential-dropdown-menus' => '9488bb69', - 'javelin-behavior-differential-edit-inline-comments' => '9488bb69', - 'javelin-behavior-differential-feedback-preview' => '9488bb69', - 'javelin-behavior-differential-keyboard-navigation' => '9488bb69', - 'javelin-behavior-differential-populate' => '9488bb69', - 'javelin-behavior-differential-show-more' => '9488bb69', - 'javelin-behavior-differential-toggle-files' => '9488bb69', - 'javelin-behavior-differential-user-select' => '9488bb69', + 'javelin-behavior-differential-accept-with-errors' => '4ad86dee', + 'javelin-behavior-differential-add-reviewers-and-ccs' => '4ad86dee', + 'javelin-behavior-differential-comment-jump' => '4ad86dee', + 'javelin-behavior-differential-diff-radios' => '4ad86dee', + 'javelin-behavior-differential-dropdown-menus' => '4ad86dee', + 'javelin-behavior-differential-edit-inline-comments' => '4ad86dee', + 'javelin-behavior-differential-feedback-preview' => '4ad86dee', + 'javelin-behavior-differential-keyboard-navigation' => '4ad86dee', + 'javelin-behavior-differential-populate' => '4ad86dee', + 'javelin-behavior-differential-show-more' => '4ad86dee', + 'javelin-behavior-differential-toggle-files' => '4ad86dee', + 'javelin-behavior-differential-user-select' => '4ad86dee', 'javelin-behavior-diffusion-commit-graph' => '96909266', 'javelin-behavior-diffusion-pull-lastmodified' => '96909266', 'javelin-behavior-error-log' => '4ccfeb47', @@ -4432,7 +4432,7 @@ celerity_register_resource_map(array( 'javelin-behavior-history-install' => '75ccea43', 'javelin-behavior-konami' => '75ccea43', 'javelin-behavior-lightbox-attachments' => '75ccea43', - 'javelin-behavior-load-blame' => '9488bb69', + 'javelin-behavior-load-blame' => '4ad86dee', 'javelin-behavior-maniphest-batch-selector' => '98f64f07', 'javelin-behavior-maniphest-subpriority-editor' => '98f64f07', 'javelin-behavior-maniphest-transaction-controls' => '98f64f07', @@ -4444,7 +4444,7 @@ celerity_register_resource_map(array( 'javelin-behavior-phabricator-hovercards' => '75ccea43', 'javelin-behavior-phabricator-keyboard-shortcuts' => '75ccea43', 'javelin-behavior-phabricator-nav' => '75ccea43', - 'javelin-behavior-phabricator-object-selector' => '9488bb69', + 'javelin-behavior-phabricator-object-selector' => '4ad86dee', 'javelin-behavior-phabricator-oncopy' => '75ccea43', 'javelin-behavior-phabricator-remarkup-assist' => '75ccea43', 'javelin-behavior-phabricator-reveal-content' => '75ccea43', @@ -4452,7 +4452,7 @@ celerity_register_resource_map(array( 'javelin-behavior-phabricator-tooltips' => '75ccea43', 'javelin-behavior-phabricator-watch-anchor' => '75ccea43', 'javelin-behavior-refresh-csrf' => '75ccea43', - 'javelin-behavior-repository-crossreference' => '9488bb69', + 'javelin-behavior-repository-crossreference' => '4ad86dee', 'javelin-behavior-toggle-class' => '75ccea43', 'javelin-behavior-workflow' => '75ccea43', 'javelin-dom' => 'a9f14d76', @@ -4483,7 +4483,7 @@ celerity_register_resource_map(array( 'phabricator-content-source-view-css' => 'dd27a69b', 'phabricator-core-css' => '178f5351', 'phabricator-crumbs-view-css' => '178f5351', - 'phabricator-drag-and-drop-file-upload' => '9488bb69', + 'phabricator-drag-and-drop-file-upload' => '4ad86dee', 'phabricator-dropdown-menu' => '75ccea43', 'phabricator-file-upload' => '75ccea43', 'phabricator-filetree-view-css' => '178f5351', @@ -4507,7 +4507,7 @@ celerity_register_resource_map(array( 'phabricator-project-tag-css' => 'adc3c36d', 'phabricator-property-list-view-css' => '178f5351', 'phabricator-remarkup-css' => '178f5351', - 'phabricator-shaped-request' => '9488bb69', + 'phabricator-shaped-request' => '4ad86dee', 'phabricator-side-menu-view-css' => '178f5351', 'phabricator-standard-page-view' => '178f5351', 'phabricator-tag-view-css' => '178f5351', diff --git a/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js b/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js index 00d8419ba0..8fbf856e79 100644 --- a/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js +++ b/webroot/rsrc/js/application/differential/behavior-dropdown-menus.js @@ -79,7 +79,8 @@ JX.behavior('differential-dropdown-menus', function(config) { if (data.editor) { menu.addItem(new JX.PhabricatorMenuItem( pht('Open in Editor'), - JX.bind(null, location.assign, data.editor), // Open in the same window. + // Open in the same window. + JX.bind(location, location.assign, data.editor), data.editor)); }