Page MenuHomePhabricator
Files F15382866

D15976.id.diff
No OneTemporary
Actions

D15976.id.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
@@ -8,7 +8,7 @@
return array(
'names' => array(
'core.pkg.css' => '8aeacc63',
- 'core.pkg.js' => '50e9228e',
+ 'core.pkg.js' => '3f15fa62',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '33da0633',
'differential.pkg.js' => '4b7d8f19',
@@ -490,7 +490,7 @@
'rsrc/js/core/behavior-history-install.js' => '7ee2b591',
'rsrc/js/core/behavior-hovercard.js' => 'bcaccd64',
'rsrc/js/core/behavior-keyboard-pager.js' => 'a8da01f0',
- 'rsrc/js/core/behavior-keyboard-shortcuts.js' => 'd75709e6',
+ 'rsrc/js/core/behavior-keyboard-shortcuts.js' => '7835f8c9',
'rsrc/js/core/behavior-lightbox-attachments.js' => 'f8ba29d7',
'rsrc/js/core/behavior-line-linker.js' => '1499a8cb',
'rsrc/js/core/behavior-more.js' => 'a80d0378',
@@ -651,7 +651,7 @@
'javelin-behavior-phabricator-gesture' => '3ab51e2c',
'javelin-behavior-phabricator-gesture-example' => '558829c2',
'javelin-behavior-phabricator-keyboard-pager' => 'a8da01f0',
- 'javelin-behavior-phabricator-keyboard-shortcuts' => 'd75709e6',
+ 'javelin-behavior-phabricator-keyboard-shortcuts' => '7835f8c9',
'javelin-behavior-phabricator-line-linker' => '1499a8cb',
'javelin-behavior-phabricator-nav' => '56a1ca03',
'javelin-behavior-phabricator-notification-example' => '8ce821c5',
@@ -1492,6 +1492,13 @@
'multirow-row-manager',
'javelin-json',
),
+ '7835f8c9' => array(
+ 'javelin-behavior',
+ 'javelin-workflow',
+ 'javelin-json',
+ 'javelin-dom',
+ 'phabricator-keyboard-shortcut',
+ ),
'7927a7d3' => array(
'javelin-behavior',
'javelin-quicksand',
@@ -1973,13 +1980,6 @@
'javelin-json',
'phabricator-prefab',
),
- 'd75709e6' => array(
- 'javelin-behavior',
- 'javelin-workflow',
- 'javelin-json',
- 'javelin-dom',
- 'phabricator-keyboard-shortcut',
- ),
'd7a74243' => array(
'javelin-behavior',
'javelin-stratcom',
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3331,7 +3331,6 @@
'PhabricatorSearchNgramsDestructionEngineExtension' => 'applications/search/engineextension/PhabricatorSearchNgramsDestructionEngineExtension.php',
'PhabricatorSearchOrderController' => 'applications/search/controller/PhabricatorSearchOrderController.php',
'PhabricatorSearchOrderField' => 'applications/search/field/PhabricatorSearchOrderField.php',
- 'PhabricatorSearchPreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php',
'PhabricatorSearchRelationship' => 'applications/search/constants/PhabricatorSearchRelationship.php',
'PhabricatorSearchResultBucket' => 'applications/search/buckets/PhabricatorSearchResultBucket.php',
'PhabricatorSearchResultBucketGroup' => 'applications/search/buckets/PhabricatorSearchResultBucketGroup.php',
@@ -8044,7 +8043,6 @@
'PhabricatorSearchNgramsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension',
'PhabricatorSearchOrderController' => 'PhabricatorSearchBaseController',
'PhabricatorSearchOrderField' => 'PhabricatorSearchField',
- 'PhabricatorSearchPreferencesSettingsPanel' => 'PhabricatorSettingsPanel',
'PhabricatorSearchRelationship' => 'Phobject',
'PhabricatorSearchResultBucket' => 'Phobject',
'PhabricatorSearchResultBucketGroup' => 'Phobject',
diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
--- a/src/applications/search/controller/PhabricatorSearchController.php
+++ b/src/applications/search/controller/PhabricatorSearchController.php
@@ -13,14 +13,11 @@
$viewer = $this->getViewer();
if ($request->getStr('jump') != 'no') {
- $pref_jump = PhabricatorUserPreferences::PREFERENCE_SEARCHBAR_JUMP;
- if ($viewer->loadPreferences($pref_jump, 1)) {
- $response = PhabricatorJumpNavHandler::getJumpResponse(
- $viewer,
- $request->getStr('query'));
- if ($response) {
- return $response;
- }
+ $response = PhabricatorJumpNavHandler::getJumpResponse(
+ $viewer,
+ $request->getStr('query'));
+ if ($response) {
+ return $response;
}
}
diff --git a/src/applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php
deleted file mode 100644
--- a/src/applications/settings/panel/PhabricatorSearchPreferencesSettingsPanel.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-final class PhabricatorSearchPreferencesSettingsPanel
- extends PhabricatorSettingsPanel {
-
- public function getPanelKey() {
- return 'search';
- }
-
- public function getPanelName() {
- return pht('Search Preferences');
- }
-
- public function getPanelGroup() {
- return pht('Application Settings');
- }
-
- public function processRequest(AphrontRequest $request) {
- $user = $request->getUser();
- $preferences = $user->loadPreferences();
-
- $pref_jump = PhabricatorUserPreferences::PREFERENCE_SEARCHBAR_JUMP;
- $pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT;
-
- if ($request->isFormPost()) {
- $preferences->setPreference($pref_jump,
- $request->getBool($pref_jump));
-
- $preferences->setPreference($pref_shortcut,
- $request->getBool($pref_shortcut));
-
- $preferences->save();
- return id(new AphrontRedirectResponse())
- ->setURI($this->getPanelURI('?saved=true'));
- }
-
- $form = id(new AphrontFormView())
- ->setUser($user)
- ->appendChild(
- id(new AphrontFormCheckboxControl())
- ->addCheckbox($pref_jump,
- 1,
- pht('Enable jump nav functionality in all search boxes.'),
- $preferences->getPreference($pref_jump, 1))
- ->addCheckbox($pref_shortcut,
- 1,
- pht("Press '%s' to focus the search input.", '/'),
- $preferences->getPreference($pref_shortcut, 1)))
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->setValue(pht('Save')));
-
- $form_box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Search Preferences'))
- ->setFormSaved($request->getStr('saved') === 'true')
- ->setForm($form);
-
- return array(
- $form_box,
- );
- }
-}
diff --git a/src/applications/settings/storage/PhabricatorUserPreferences.php b/src/applications/settings/storage/PhabricatorUserPreferences.php
--- a/src/applications/settings/storage/PhabricatorUserPreferences.php
+++ b/src/applications/settings/storage/PhabricatorUserPreferences.php
@@ -19,8 +19,6 @@
const PREFERENCE_VARY_SUBJECT = 'vary-subject';
const PREFERENCE_HTML_EMAILS = 'html-emails';
- const PREFERENCE_SEARCHBAR_JUMP = 'searchbar-jump';
- const PREFERENCE_SEARCH_SHORTCUT = 'search-shortcut';
const PREFERENCE_SEARCH_SCOPE = 'search-scope';
const PREFERENCE_DIFFUSION_BLAME = 'diffusion-blame';
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -186,11 +186,6 @@
}
$result = $search;
-
- $pref_shortcut = PhabricatorUserPreferences::PREFERENCE_SEARCH_SHORTCUT;
- if ($viewer->loadPreferences()->getPreference($pref_shortcut, true)) {
- $keyboard_config['searchID'] = $search->getID();
- }
}
Javelin::initBehavior('phabricator-keyboard-shortcuts', $keyboard_config);
diff --git a/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js b/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
--- a/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
+++ b/webroot/rsrc/js/core/behavior-keyboard-shortcuts.js
@@ -30,14 +30,4 @@
})
.register();
- if (config.searchID) {
- desc = 'Give keyboard focus to the search box.';
- new JX.KeyboardShortcut('/', desc)
- .setHandler(function() {
- var search = JX.$(config.searchID);
- search.focus();
- search.select();
- })
- .register();
- }
});

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 2:46 PM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223010
Default Alt Text
D15976.id.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility