Page MenuHomePhabricator
Files F13182748

D8232.diff
No OneTemporary
Actions

D8232.diff
View Options

Index: conf/default.conf.php
===================================================================
--- conf/default.conf.php
+++ conf/default.conf.php
@@ -638,21 +638,6 @@
'https' => true,
),
- // Tokenizers are UI controls which let the user select other users, email
- // addresses, project names, etc., by typing the first few letters and having
- // the control autocomplete from a list. They can load their data in two ways:
- // either in a big chunk up front, or as the user types. By default, the data
- // is loaded in a big chunk. This is simpler and performs better for small
- // datasets. However, if you have a very large number of users or projects,
- // (in the ballpark of more than a thousand), loading all that data may become
- // slow enough that it's worthwhile to query on demand instead. This makes
- // the typeahead slightly less responsive but overall performance will be much
- // better if you have a ton of stuff. You can figure out which setting is
- // best for your install by changing this setting and then playing with a
- // user tokenizer (like the user selectors in Maniphest or Differential) and
- // seeing which setting loads faster and feels better.
- 'tokenizer.ondemand' => false,
-
// By default, Phabricator includes some silly nonsense in the UI, such as
// a submit button called "Clowncopterize" in Differential and a call to
// "Leap Into Action". If you'd prefer more traditional UI strings like
Index: resources/celerity/map.php
===================================================================
--- resources/celerity/map.php
+++ resources/celerity/map.php
@@ -8,7 +8,7 @@
'names' =>
array(
'core.pkg.css' => '044c2f0c',
- 'core.pkg.js' => 'ba6e232d',
+ 'core.pkg.js' => '0dc59a05',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '6aef439e',
'differential.pkg.js' => '322ea941',
@@ -431,7 +431,7 @@
'rsrc/js/core/KeyboardShortcutManager.js' => 'ad7a69ca',
'rsrc/js/core/MultirowRowManager.js' => 'e7076916',
'rsrc/js/core/Notification.js' => '95944043',
- 'rsrc/js/core/Prefab.js' => '1e644329',
+ 'rsrc/js/core/Prefab.js' => '979f864d',
'rsrc/js/core/ShapedRequest.js' => 'dfa181a4',
'rsrc/js/core/TextAreaUtils.js' => 'b3ec3cfc',
'rsrc/js/core/ToolTip.js' => '0a81ea29',
@@ -701,7 +701,7 @@
'phabricator-object-list-view-css' => '1a1ea560',
'phabricator-object-selector-css' => '029a133d',
'phabricator-phtize' => 'd254d646',
- 'phabricator-prefab' => '1e644329',
+ 'phabricator-prefab' => '979f864d',
'phabricator-profile-css' => '3a7e04ca',
'phabricator-project-tag-css' => '095c9404',
'phabricator-remarkup-css' => 'ca7f2265',
@@ -928,19 +928,6 @@
5 => 'phabricator-drag-and-drop-file-upload',
6 => 'phabricator-draggable-list',
),
- '1e644329' =>
- array(
- 0 => 'javelin-install',
- 1 => 'javelin-util',
- 2 => 'javelin-dom',
- 3 => 'javelin-typeahead',
- 4 => 'javelin-tokenizer',
- 5 => 'javelin-typeahead-preloaded-source',
- 6 => 'javelin-typeahead-ondemand-source',
- 7 => 'javelin-dom',
- 8 => 'javelin-stratcom',
- 9 => 'javelin-util',
- ),
'1f595fb0' =>
array(
0 => 'javelin-install',
@@ -1411,6 +1398,19 @@
2 => 'javelin-view-visitor',
3 => 'javelin-util',
),
+ '979f864d' =>
+ array(
+ 0 => 'javelin-install',
+ 1 => 'javelin-util',
+ 2 => 'javelin-dom',
+ 3 => 'javelin-typeahead',
+ 4 => 'javelin-tokenizer',
+ 5 => 'javelin-typeahead-preloaded-source',
+ 6 => 'javelin-typeahead-ondemand-source',
+ 7 => 'javelin-dom',
+ 8 => 'javelin-stratcom',
+ 9 => 'javelin-util',
+ ),
'9b9197be' =>
array(
0 => 'javelin-behavior',
Index: src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
===================================================================
--- src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
+++ src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
@@ -178,6 +178,8 @@
'Mail is now always delivered by the daemons.'),
'auth.sessions.conduit' => $session_reason,
'auth.sessions.web' => $session_reason,
+ 'tokenizer.ondemand' => pht(
+ 'Phabricator now manages typeahead strategies automatically.'),
);
return $ancient_config;
Index: src/applications/config/option/PhabricatorCoreConfigOptions.php
===================================================================
--- src/applications/config/option/PhabricatorCoreConfigOptions.php
+++ src/applications/config/option/PhabricatorCoreConfigOptions.php
@@ -137,32 +137,6 @@
" %s", $path))
->addExample('/usr/local/bin', pht('Add One Path'))
->addExample("/usr/bin\n/usr/local/bin", pht('Add Multiple Paths')),
- $this->newOption('tokenizer.ondemand', 'bool', false)
- ->setBoolOptions(
- array(
- pht("Query on demand"),
- pht("Query on page load"),
- ))
- ->setSummary(
- pht("Query for tokenizer fields on demand."))
- ->setDescription(
- pht(
- "Tokenizers are UI controls which let the user select other ".
- "users, email addresses, project names, etc., by typing the ".
- "first few letters and having the control autocomplete from a ".
- "list. They can load their data in two ways: either in a big ".
- "chunk up front, or as the user types. By default, the data is ".
- "loaded in a big chunk. This is simpler and performs better for ".
- "small datasets. However, if you have a very large number of ".
- "users or projects, (in the ballpark of more than a thousand), ".
- "loading all that data may become slow enough that it's ".
- "worthwhile to query on demand instead. This makes the typeahead ".
- "slightly less responsive but overall performance will be much ".
- "better if you have a ton of stuff. You can figure out which ".
- "setting is best for your install by changing this setting and ".
- "then playing with a user tokenizer (like the user selectors in ".
- "Maniphest or Differential) and seeing which setting loads ".
- "faster and feels better.")),
$this->newOption('config.lock', 'set', array())
->setLocked(true)
->setDescription(pht('Additional configuration options to lock.')),
Index: src/applications/differential/view/DifferentialAddCommentView.php
===================================================================
--- src/applications/differential/view/DifferentialAddCommentView.php
+++ src/applications/differential/view/DifferentialAddCommentView.php
@@ -121,7 +121,6 @@
'src' => '/typeahead/common/usersorprojects/',
'value' => $this->reviewers,
'row' => 'add-reviewers',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'labels' => $add_reviewers_labels,
'placeholder' => pht('Type a user or project name...'),
),
@@ -130,7 +129,6 @@
'src' => '/typeahead/common/mailable/',
'value' => $this->ccs,
'row' => 'add-ccs',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a user or mailing list...'),
),
),
Index: src/applications/diffusion/controller/DiffusionCommitController.php
===================================================================
--- src/applications/diffusion/controller/DiffusionCommitController.php
+++ src/applications/diffusion/controller/DiffusionCommitController.php
@@ -780,14 +780,12 @@
'actions' => array('add_auditors' => 1),
'src' => '/typeahead/common/users/',
'row' => 'add-auditors',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a user name...'),
),
'add-ccs-tokenizer' => array(
'actions' => array('add_ccs' => 1),
'src' => '/typeahead/common/mailable/',
'row' => 'add-ccs',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a user or mailing list...'),
),
),
Index: src/applications/maniphest/controller/ManiphestTaskDetailController.php
===================================================================
--- src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -308,7 +308,6 @@
ManiphestTransaction::TYPE_PROJECTS => array(
'id' => 'projects-tokenizer',
'src' => '/typeahead/common/projects/',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a project name...'),
),
ManiphestTransaction::TYPE_OWNER => array(
@@ -316,13 +315,11 @@
'src' => '/typeahead/common/users/',
'value' => $default_claim,
'limit' => 1,
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a user name...'),
),
ManiphestTransaction::TYPE_CCS => array(
'id' => 'cc-tokenizer',
'src' => '/typeahead/common/mailable/',
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'placeholder' => pht('Type a user or mailing list...'),
),
);
Index: src/view/form/control/AphrontFormTokenizerControl.php
===================================================================
--- src/view/form/control/AphrontFormTokenizerControl.php
+++ src/view/form/control/AphrontFormTokenizerControl.php
@@ -64,7 +64,6 @@
'value' => mpull($values, 'getFullName', 'getPHID'),
'icons' => mpull($values, 'getTypeIcon', 'getPHID'),
'limit' => $this->limit,
- 'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
'username' => $username,
'placeholder' => $this->placeholder,
));
Index: webroot/rsrc/js/core/Prefab.js
===================================================================
--- webroot/rsrc/js/core/Prefab.js
+++ webroot/rsrc/js/core/Prefab.js
@@ -58,7 +58,15 @@
}
var datasource;
- if (config.ondemand) {
+
+ // Default to an ondemand source if no alternate configuration is
+ // provided.
+ var ondemand = true;
+ if ('ondemand' in config) {
+ ondemand = config.ondemand;
+ }
+
+ if (ondemand) {
datasource = new JX.TypeaheadOnDemandSource(config.src);
} else {
datasource = new JX.TypeaheadPreloadedSource(config.src);

File Metadata

Mime Type
text/plain
Expires
Sat, May 11, 2:12 AM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6284699
Default Alt Text
D8232.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility