diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -418,13 +418,13 @@ 'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888', 'rsrc/js/application/harbormaster/behavior-harbormaster-log.js' => '191b4909', 'rsrc/js/application/herald/HeraldRuleEditor.js' => 'dca75c0e', - 'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec', + 'rsrc/js/application/herald/PathTypeahead.js' => '78039abe', 'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3', 'rsrc/js/application/maniphest/behavior-batch-selector.js' => 'ad54037e', 'rsrc/js/application/maniphest/behavior-line-chart.js' => 'e4232876', 'rsrc/js/application/maniphest/behavior-list-edit.js' => 'a9f88de2', 'rsrc/js/application/maniphest/behavior-subpriorityeditor.js' => '71237763', - 'rsrc/js/application/owners/OwnersPathEditor.js' => '996d62b9', + 'rsrc/js/application/owners/OwnersPathEditor.js' => '52b9cbc4', 'rsrc/js/application/owners/owners-path-editor.js' => '7a68dda3', 'rsrc/js/application/passphrase/passphrase-credential-control.js' => '3cb0b2fc', 'rsrc/js/application/pholio/behavior-pholio-mock-edit.js' => 'bee502c8', @@ -764,10 +764,10 @@ 'maniphest-task-edit-css' => 'fda62a9b', 'maniphest-task-summary-css' => '11cc5344', 'multirow-row-manager' => 'b5d57730', - 'owners-path-editor' => '996d62b9', + 'owners-path-editor' => '52b9cbc4', 'owners-path-editor-css' => '2f00933b', 'paste-css' => '9fcc9773', - 'path-typeahead' => 'f7fc67ec', + 'path-typeahead' => '78039abe', 'people-picture-menu-item-css' => 'a06f7f34', 'people-profile-css' => '4df76faf', 'phabricator-action-list-view-css' => '0bcd9a45', @@ -1337,6 +1337,14 @@ 'javelin-vector', 'javelin-typeahead-static-source', ), + '52b9cbc4' => array( + 'multirow-row-manager', + 'javelin-install', + 'path-typeahead', + 'javelin-dom', + 'javelin-util', + 'phabricator-prefab', + ), '54b612ba' => array( 'javelin-color', 'javelin-install', @@ -1534,6 +1542,14 @@ 'javelin-request', 'javelin-util', ), + '78039abe' => array( + 'javelin-install', + 'javelin-typeahead', + 'javelin-dom', + 'javelin-request', + 'javelin-typeahead-ondemand-source', + 'javelin-util', + ), '7927a7d3' => array( 'javelin-behavior', 'javelin-quicksand', @@ -1685,14 +1701,6 @@ 'javelin-mask', 'phabricator-drag-and-drop-file-upload', ), - '996d62b9' => array( - 'multirow-row-manager', - 'javelin-install', - 'path-typeahead', - 'javelin-dom', - 'javelin-util', - 'phabricator-prefab', - ), '9a6dd75c' => array( 'javelin-behavior', 'javelin-stratcom', @@ -2163,14 +2171,6 @@ 'javelin-util', 'javelin-reactor', ), - 'f7fc67ec' => array( - 'javelin-install', - 'javelin-typeahead', - 'javelin-dom', - 'javelin-request', - 'javelin-typeahead-ondemand-source', - 'javelin-util', - ), 'f829edb3' => array( 'javelin-view', 'javelin-install', diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php --- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php +++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php @@ -74,15 +74,6 @@ ->setViewer($viewer) ->execute(); - $default_paths = array(); - foreach ($repos as $repo) { - $default_path = $repo->getDetail('default-owners-path'); - if ($default_path) { - $default_paths[$repo->getPHID()] = $default_path; - } - } - - $repo_map = array(); foreach ($repos as $key => $repo) { $monogram = $repo->getMonogram(); @@ -106,8 +97,6 @@ 'completeURI' => '/diffusion/services/path/complete/', 'validateURI' => '/diffusion/services/path/validate/', - - 'repositoryDefaultPaths' => $default_paths, )); require_celerity_resource('owners-path-editor-css'); diff --git a/webroot/rsrc/js/application/herald/PathTypeahead.js b/webroot/rsrc/js/application/herald/PathTypeahead.js --- a/webroot/rsrc/js/application/herald/PathTypeahead.js +++ b/webroot/rsrc/js/application/herald/PathTypeahead.js @@ -17,12 +17,7 @@ this._completeURI = config.completeURI; this._validateURI = config.validateURI; this._errorDisplay = config.error_display; - - /* - * Default values to preload the typeahead with, for extremely common - * cases. - */ - this._textInputValues = config.repositoryDefaultPaths; + this._textInputValues = {}; this._initializeDatasource(); this._initializeTypeahead(this._input); diff --git a/webroot/rsrc/js/application/owners/OwnersPathEditor.js b/webroot/rsrc/js/application/owners/OwnersPathEditor.js --- a/webroot/rsrc/js/application/owners/OwnersPathEditor.js +++ b/webroot/rsrc/js/application/owners/OwnersPathEditor.js @@ -28,7 +28,6 @@ this._completeURI = config.completeURI; this._validateURI = config.validateURI; - this._repositoryDefaultPaths = config.repositoryDefaultPaths; this._initializePaths(config.pathRefs); }, @@ -67,8 +66,6 @@ */ _lastRepositoryChoice : null, - _repositoryDefaultPaths : null, - /* * Initialize with 0 or more rows. * Adds one initial row if none are given. @@ -144,13 +141,13 @@ [exclude_cell, repo_cell, typeahead_cell, error_display_cell]); new JX.PathTypeahead({ - repositoryDefaultPaths : this._repositoryDefaultPaths, repo_select : repo_select, path_input : path_input, hardpoint : hardpoint, error_display : error_display, completeURI : this._completeURI, - validateURI : this._validateURI}).start(); + validateURI : this._validateURI + }).start(); this._count++; return row;