diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => '0b64e988', 'conpherence.pkg.js' => '6249a1cf', - 'core.pkg.css' => '9c725fa0', + 'core.pkg.css' => '1afa1d13', 'core.pkg.js' => 'a2ead3fe', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '9535a7e6', @@ -162,7 +162,7 @@ 'rsrc/css/phui/phui-object-box.css' => '6b487c57', 'rsrc/css/phui/phui-pager.css' => 'bea33d23', 'rsrc/css/phui/phui-pinboard-view.css' => '2495140e', - 'rsrc/css/phui/phui-profile-menu.css' => '4768721a', + 'rsrc/css/phui/phui-profile-menu.css' => 'c71ecdcd', 'rsrc/css/phui/phui-property-list-view.css' => '6d8e58ac', 'rsrc/css/phui/phui-remarkup-preview.css' => '1a8f2591', 'rsrc/css/phui/phui-segment-bar-view.css' => '46342871', @@ -172,7 +172,7 @@ 'rsrc/css/phui/phui-timeline-view.css' => 'bc523970', 'rsrc/css/phui/phui-two-column-view.css' => '7babf5b9', 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'b60ef38a', - 'rsrc/css/phui/workboards/phui-workboard.css' => '16441d5e', + 'rsrc/css/phui/workboards/phui-workboard.css' => 'c88912ee', 'rsrc/css/phui/workboards/phui-workcard.css' => '00979e40', 'rsrc/css/phui/workboards/phui-workpanel.css' => 'a3a63478', 'rsrc/css/sprite-login.css' => '587d92d7', @@ -535,7 +535,6 @@ 'rsrc/js/core/phtize.js' => 'd254d646', 'rsrc/js/phui/behavior-phui-dropdown-menu.js' => '1aa4c968', 'rsrc/js/phui/behavior-phui-file-upload.js' => 'b003d4fb', - 'rsrc/js/phui/behavior-phui-profile-menu.js' => '12884df9', 'rsrc/js/phui/behavior-phui-submenu.js' => 'a6f7a73b', 'rsrc/js/phui/behavior-phui-tab-group.js' => '0a0b10e9', 'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8', @@ -690,7 +689,6 @@ 'javelin-behavior-phui-dropdown-menu' => '1aa4c968', 'javelin-behavior-phui-file-upload' => 'b003d4fb', 'javelin-behavior-phui-hovercards' => 'bcaccd64', - 'javelin-behavior-phui-profile-menu' => '12884df9', 'javelin-behavior-phui-submenu' => 'a6f7a73b', 'javelin-behavior-phui-tab-group' => '0a0b10e9', 'javelin-behavior-policy-control' => 'd0c516d5', @@ -883,7 +881,7 @@ 'phui-oi-simple-ui-css' => 'a8beebea', 'phui-pager-css' => 'bea33d23', 'phui-pinboard-view-css' => '2495140e', - 'phui-profile-menu-css' => '4768721a', + 'phui-profile-menu-css' => 'c71ecdcd', 'phui-property-list-view-css' => '6d8e58ac', 'phui-remarkup-preview-css' => '1a8f2591', 'phui-segment-bar-view-css' => '46342871', @@ -894,7 +892,7 @@ 'phui-timeline-view-css' => 'bc523970', 'phui-two-column-view-css' => '7babf5b9', 'phui-workboard-color-css' => 'b60ef38a', - 'phui-workboard-view-css' => '16441d5e', + 'phui-workboard-view-css' => 'c88912ee', 'phui-workcard-view-css' => '00979e40', 'phui-workpanel-view-css' => 'a3a63478', 'phuix-action-list-view' => 'b5c256b8', @@ -1030,11 +1028,6 @@ 'javelin-dom', 'javelin-typeahead-normalizer', ), - '12884df9' => array( - 'javelin-behavior', - 'javelin-stratcom', - 'javelin-dom', - ), '13c739ea' => 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 @@ -3422,7 +3422,6 @@ 'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php', 'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php', 'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php', - 'PhabricatorProfileMenuCollapsedSetting' => 'applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php', 'PhabricatorProfileMenuEditEngine' => 'applications/search/editor/PhabricatorProfileMenuEditEngine.php', 'PhabricatorProfileMenuEditor' => 'applications/search/editor/PhabricatorProfileMenuEditor.php', 'PhabricatorProfileMenuEngine' => 'applications/search/engine/PhabricatorProfileMenuEngine.php', @@ -8575,7 +8574,6 @@ ), 'PhabricatorPolicyType' => 'PhabricatorPolicyConstants', 'PhabricatorPonderApplication' => 'PhabricatorApplication', - 'PhabricatorProfileMenuCollapsedSetting' => 'PhabricatorInternalSetting', 'PhabricatorProfileMenuEditEngine' => 'PhabricatorEditEngine', 'PhabricatorProfileMenuEditor' => 'PhabricatorApplicationTransactionEditor', 'PhabricatorProfileMenuEngine' => 'Phobject', diff --git a/src/applications/search/engine/PhabricatorProfileMenuEngine.php b/src/applications/search/engine/PhabricatorProfileMenuEngine.php --- a/src/applications/search/engine/PhabricatorProfileMenuEngine.php +++ b/src/applications/search/engine/PhabricatorProfileMenuEngine.php @@ -239,11 +239,6 @@ } } - $more_items = $this->newAutomaticMenuItems($nav); - foreach ($more_items as $item) { - $nav->addMenuItem($item); - } - $nav->selectFilter(null); $this->navigation = $nav; @@ -410,73 +405,6 @@ } } - private function newAutomaticMenuItems(AphrontSideNavFilterView $nav) { - $items = array(); - - // NOTE: We're adding a spacer item for the fixed footer, so that if the - // menu taller than the page content you can still scroll down the page far - // enough to access the last item without the content being obscured by the - // fixed items. - $items[] = id(new PHUIListItemView()) - ->setHideInApplicationMenu(true) - ->addClass('phui-profile-menu-spacer'); - - $collapse_id = celerity_generate_unique_node_id(); - $viewer = $this->getViewer(); - $collapse_key = PhabricatorProfileMenuCollapsedSetting::SETTINGKEY; - - $is_collapsed = $viewer->getUserSetting($collapse_key); - - if ($is_collapsed) { - $nav->addClass('phui-profile-menu-collapsed'); - } else { - $nav->addClass('phui-profile-menu-expanded'); - } - - if ($viewer->isLoggedIn()) { - $settings_uri = '/settings/adjust/?key='.$collapse_key; - } else { - $settings_uri = null; - } - - Javelin::initBehavior( - 'phui-profile-menu', - array( - 'menuID' => $nav->getMainID(), - 'collapseID' => $collapse_id, - 'isCollapsed' => (bool)$is_collapsed, - 'settingsURI' => $settings_uri, - )); - - $collapse_icon = id(new PHUIIconCircleView()) - ->addClass('phui-list-item-icon') - ->addClass('phui-profile-menu-visible-when-expanded') - ->setIcon('fa-chevron-left'); - - $expand_icon = id(new PHUIIconCircleView()) - ->addClass('phui-list-item-icon') - ->addClass('phui-profile-menu-visible-when-collapsed') - ->addSigil('has-tooltip') - ->setMetadata( - array( - 'tip' => pht('Expand'), - 'align' => 'E', - )) - ->setIcon('fa-chevron-right'); - - $items[] = id(new PHUIListItemView()) - ->setName('Collapse') - ->addIcon($collapse_icon) - ->addIcon($expand_icon) - ->setID($collapse_id) - ->addClass('phui-profile-menu-footer') - ->addClass('phui-profile-menu-footer-1') - ->setHideInApplicationMenu(true) - ->setHref('#'); - - return $items; - } - public function getConfigureURI() { return $this->getItemURI('configure/'); } diff --git a/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php b/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php deleted file mode 100644 --- a/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php +++ /dev/null @@ -1,12 +0,0 @@ -