From 120e44c344af6dc42072ed283a5128c1825d0128 Mon Sep 17 00:00:00 2001 From: epriestley Date: Sat, 15 Dec 2012 06:39:33 -0800 Subject: [PATCH] Fix two left-nav bugs Summary: - Fixes a bug where dragging a flexible left nav and then pressing "f" to hide it didn't properly reset the content panel's left margin. - Fixes a bug where D4185 removed "white-space: nowrap;" accidentally (from @asherkin) Test Plan: - Dragged bar, then pressed "f". - Can't repro the nowrap thing for some reason. iiam Reviewers: asherkin, vrana Reviewed By: vrana CC: aran Differential Revision: https://secure.phabricator.com/D4194 --- src/__celerity_resource_map__.php | 150 +++++++++--------- .../rsrc/css/aphront/phabricator-nav-view.css | 1 + .../core/behavior-phabricator-nav.js | 15 +- 3 files changed, 86 insertions(+), 80 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 8f87314945..bddd118bef 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -1584,7 +1584,7 @@ celerity_register_resource_map(array( ), 'javelin-behavior-phabricator-nav' => array( - 'uri' => '/res/230d0df2/rsrc/js/application/core/behavior-phabricator-nav.js', + 'uri' => '/res/1aa9aa6f/rsrc/js/application/core/behavior-phabricator-nav.js', 'type' => 'js', 'requires' => array( @@ -2615,7 +2615,7 @@ celerity_register_resource_map(array( ), 'phabricator-nav-view-css' => array( - 'uri' => '/res/8dce78bc/rsrc/css/aphront/phabricator-nav-view.css', + 'uri' => '/res/990ab943/rsrc/css/aphront/phabricator-nav-view.css', 'type' => 'css', 'requires' => array( @@ -3201,7 +3201,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '186ea458' => + 'a2a7a038' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3245,10 +3245,10 @@ celerity_register_resource_map(array( 36 => 'phabricator-crumbs-view-css', 37 => 'phabricator-object-item-list-view-css', ), - 'uri' => '/res/pkg/186ea458/core.pkg.css', + 'uri' => '/res/pkg/a2a7a038/core.pkg.css', 'type' => 'css', ), - 'f7e6114f' => + 'ba3c323b' => array( 'name' => 'core.pkg.js', 'symbols' => @@ -3285,7 +3285,7 @@ celerity_register_resource_map(array( 29 => 'phabricator-textareautils', 30 => 'phabricator-file-upload', ), - 'uri' => '/res/pkg/f7e6114f/core.pkg.js', + 'uri' => '/res/pkg/ba3c323b/core.pkg.js', 'type' => 'js', ), '8edbada5' => @@ -3433,20 +3433,20 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '7839ae2d', - 'aphront-crumbs-view-css' => '186ea458', - 'aphront-dialog-view-css' => '186ea458', - 'aphront-error-view-css' => '186ea458', - 'aphront-form-view-css' => '186ea458', + 'aphront-crumbs-view-css' => 'a2a7a038', + 'aphront-dialog-view-css' => 'a2a7a038', + 'aphront-error-view-css' => 'a2a7a038', + 'aphront-form-view-css' => 'a2a7a038', 'aphront-headsup-action-list-view-css' => '94cb8965', - 'aphront-headsup-view-css' => '186ea458', - 'aphront-list-filter-view-css' => '186ea458', - 'aphront-pager-view-css' => '186ea458', - 'aphront-panel-view-css' => '186ea458', - 'aphront-side-nav-view-css' => '186ea458', - 'aphront-table-view-css' => '186ea458', - 'aphront-tokenizer-control-css' => '186ea458', - 'aphront-tooltip-css' => '186ea458', - 'aphront-typeahead-control-css' => '186ea458', + 'aphront-headsup-view-css' => 'a2a7a038', + 'aphront-list-filter-view-css' => 'a2a7a038', + 'aphront-pager-view-css' => 'a2a7a038', + 'aphront-panel-view-css' => 'a2a7a038', + 'aphront-side-nav-view-css' => 'a2a7a038', + 'aphront-table-view-css' => 'a2a7a038', + 'aphront-tokenizer-control-css' => 'a2a7a038', + 'aphront-tooltip-css' => 'a2a7a038', + 'aphront-typeahead-control-css' => 'a2a7a038', 'differential-changeset-view-css' => '94cb8965', 'differential-core-view-css' => '94cb8965', 'differential-inline-comment-editor' => '7ecd31fa', @@ -3461,18 +3461,18 @@ celerity_register_resource_map(array( 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', 'inline-comment-summary-css' => '94cb8965', - 'javelin-aphlict' => 'f7e6114f', + 'javelin-aphlict' => 'ba3c323b', 'javelin-behavior' => 'db6d724d', - 'javelin-behavior-aphlict-dropdown' => 'f7e6114f', - 'javelin-behavior-aphlict-listen' => 'f7e6114f', - 'javelin-behavior-aphront-basic-tokenizer' => 'f7e6114f', + 'javelin-behavior-aphlict-dropdown' => 'ba3c323b', + 'javelin-behavior-aphlict-listen' => 'ba3c323b', + 'javelin-behavior-aphront-basic-tokenizer' => 'ba3c323b', 'javelin-behavior-aphront-drag-and-drop' => '7ecd31fa', 'javelin-behavior-aphront-drag-and-drop-textarea' => '7ecd31fa', - 'javelin-behavior-aphront-form-disable-on-submit' => 'f7e6114f', + 'javelin-behavior-aphront-form-disable-on-submit' => 'ba3c323b', 'javelin-behavior-audit-preview' => '5e68be89', 'javelin-behavior-dark-console' => '8edbada5', 'javelin-behavior-dark-console-ajax' => '8edbada5', - 'javelin-behavior-device' => 'f7e6114f', + 'javelin-behavior-device' => 'ba3c323b', 'javelin-behavior-differential-accept-with-errors' => '7ecd31fa', 'javelin-behavior-differential-add-reviewers-and-ccs' => '7ecd31fa', 'javelin-behavior-differential-comment-jump' => '7ecd31fa', @@ -3488,27 +3488,27 @@ celerity_register_resource_map(array( 'javelin-behavior-diffusion-commit-graph' => '5e68be89', 'javelin-behavior-diffusion-pull-lastmodified' => '5e68be89', 'javelin-behavior-error-log' => '8edbada5', - 'javelin-behavior-konami' => 'f7e6114f', - 'javelin-behavior-lightbox-attachments' => 'f7e6114f', + 'javelin-behavior-konami' => 'ba3c323b', + 'javelin-behavior-lightbox-attachments' => 'ba3c323b', 'javelin-behavior-maniphest-batch-selector' => '7707de41', 'javelin-behavior-maniphest-subpriority-editor' => '7707de41', 'javelin-behavior-maniphest-transaction-controls' => '7707de41', 'javelin-behavior-maniphest-transaction-expand' => '7707de41', 'javelin-behavior-maniphest-transaction-preview' => '7707de41', - 'javelin-behavior-phabricator-active-nav' => 'f7e6114f', - 'javelin-behavior-phabricator-autofocus' => 'f7e6114f', - 'javelin-behavior-phabricator-keyboard-shortcuts' => 'f7e6114f', - 'javelin-behavior-phabricator-nav' => 'f7e6114f', + 'javelin-behavior-phabricator-active-nav' => 'ba3c323b', + 'javelin-behavior-phabricator-autofocus' => 'ba3c323b', + 'javelin-behavior-phabricator-keyboard-shortcuts' => 'ba3c323b', + 'javelin-behavior-phabricator-nav' => 'ba3c323b', 'javelin-behavior-phabricator-object-selector' => '7ecd31fa', - 'javelin-behavior-phabricator-oncopy' => 'f7e6114f', - 'javelin-behavior-phabricator-remarkup-assist' => 'f7e6114f', - 'javelin-behavior-phabricator-search-typeahead' => 'f7e6114f', - 'javelin-behavior-phabricator-tooltips' => 'f7e6114f', - 'javelin-behavior-phabricator-watch-anchor' => 'f7e6114f', - 'javelin-behavior-refresh-csrf' => 'f7e6114f', + 'javelin-behavior-phabricator-oncopy' => 'ba3c323b', + 'javelin-behavior-phabricator-remarkup-assist' => 'ba3c323b', + 'javelin-behavior-phabricator-search-typeahead' => 'ba3c323b', + 'javelin-behavior-phabricator-tooltips' => 'ba3c323b', + 'javelin-behavior-phabricator-watch-anchor' => 'ba3c323b', + 'javelin-behavior-refresh-csrf' => 'ba3c323b', 'javelin-behavior-repository-crossreference' => '7ecd31fa', - 'javelin-behavior-toggle-class' => 'f7e6114f', - 'javelin-behavior-workflow' => 'f7e6114f', + 'javelin-behavior-toggle-class' => 'ba3c323b', + 'javelin-behavior-workflow' => 'ba3c323b', 'javelin-dom' => 'db6d724d', 'javelin-event' => 'db6d724d', 'javelin-install' => 'db6d724d', @@ -3527,48 +3527,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'db6d724d', 'javelin-vector' => 'db6d724d', 'javelin-workflow' => 'db6d724d', - 'lightbox-attachment-css' => '186ea458', + 'lightbox-attachment-css' => 'a2a7a038', 'maniphest-task-summary-css' => '7839ae2d', 'maniphest-transaction-detail-css' => '7839ae2d', - 'phabricator-app-buttons-css' => '186ea458', - 'phabricator-busy' => 'f7e6114f', + 'phabricator-app-buttons-css' => 'a2a7a038', + 'phabricator-busy' => 'ba3c323b', 'phabricator-content-source-view-css' => '94cb8965', - 'phabricator-core-buttons-css' => '186ea458', - 'phabricator-core-css' => '186ea458', - 'phabricator-crumbs-view-css' => '186ea458', - 'phabricator-directory-css' => '186ea458', + 'phabricator-core-buttons-css' => 'a2a7a038', + 'phabricator-core-css' => 'a2a7a038', + 'phabricator-crumbs-view-css' => 'a2a7a038', + 'phabricator-directory-css' => 'a2a7a038', 'phabricator-drag-and-drop-file-upload' => '7ecd31fa', - 'phabricator-dropdown-menu' => 'f7e6114f', - 'phabricator-file-upload' => 'f7e6114f', - 'phabricator-filetree-view-css' => '186ea458', - 'phabricator-flag-css' => '186ea458', - 'phabricator-form-view-css' => '186ea458', - 'phabricator-header-view-css' => '186ea458', - 'phabricator-jump-nav' => '186ea458', - 'phabricator-keyboard-shortcut' => 'f7e6114f', - 'phabricator-keyboard-shortcut-manager' => 'f7e6114f', - 'phabricator-main-menu-view' => '186ea458', - 'phabricator-menu-item' => 'f7e6114f', - 'phabricator-nav-view-css' => '186ea458', - 'phabricator-notification' => 'f7e6114f', - 'phabricator-notification-css' => '186ea458', - 'phabricator-notification-menu-css' => '186ea458', - 'phabricator-object-item-list-view-css' => '186ea458', + 'phabricator-dropdown-menu' => 'ba3c323b', + 'phabricator-file-upload' => 'ba3c323b', + 'phabricator-filetree-view-css' => 'a2a7a038', + 'phabricator-flag-css' => 'a2a7a038', + 'phabricator-form-view-css' => 'a2a7a038', + 'phabricator-header-view-css' => 'a2a7a038', + 'phabricator-jump-nav' => 'a2a7a038', + 'phabricator-keyboard-shortcut' => 'ba3c323b', + 'phabricator-keyboard-shortcut-manager' => 'ba3c323b', + 'phabricator-main-menu-view' => 'a2a7a038', + 'phabricator-menu-item' => 'ba3c323b', + 'phabricator-nav-view-css' => 'a2a7a038', + 'phabricator-notification' => 'ba3c323b', + 'phabricator-notification-css' => 'a2a7a038', + 'phabricator-notification-menu-css' => 'a2a7a038', + 'phabricator-object-item-list-view-css' => 'a2a7a038', 'phabricator-object-selector-css' => '94cb8965', - 'phabricator-paste-file-upload' => 'f7e6114f', - 'phabricator-prefab' => 'f7e6114f', + 'phabricator-paste-file-upload' => 'ba3c323b', + 'phabricator-prefab' => 'ba3c323b', 'phabricator-project-tag-css' => '7839ae2d', - 'phabricator-remarkup-css' => '186ea458', + 'phabricator-remarkup-css' => 'a2a7a038', 'phabricator-shaped-request' => '7ecd31fa', - 'phabricator-side-menu-view-css' => '186ea458', - 'phabricator-standard-page-view' => '186ea458', - 'phabricator-textareautils' => 'f7e6114f', - 'phabricator-tooltip' => 'f7e6114f', - 'phabricator-transaction-view-css' => '186ea458', - 'sprite-apps-large-css' => '186ea458', - 'sprite-gradient-css' => '186ea458', - 'sprite-icon-css' => '186ea458', - 'sprite-menu-css' => '186ea458', - 'syntax-highlighting-css' => '186ea458', + 'phabricator-side-menu-view-css' => 'a2a7a038', + 'phabricator-standard-page-view' => 'a2a7a038', + 'phabricator-textareautils' => 'ba3c323b', + 'phabricator-tooltip' => 'ba3c323b', + 'phabricator-transaction-view-css' => 'a2a7a038', + 'sprite-apps-large-css' => 'a2a7a038', + 'sprite-gradient-css' => 'a2a7a038', + 'sprite-icon-css' => 'a2a7a038', + 'sprite-menu-css' => 'a2a7a038', + 'syntax-highlighting-css' => 'a2a7a038', ), )); diff --git a/webroot/rsrc/css/aphront/phabricator-nav-view.css b/webroot/rsrc/css/aphront/phabricator-nav-view.css index b9f4bbb086..3b24767e05 100644 --- a/webroot/rsrc/css/aphront/phabricator-nav-view.css +++ b/webroot/rsrc/css/aphront/phabricator-nav-view.css @@ -34,6 +34,7 @@ width: 179px; position: absolute; left: 0; + white-space: nowrap; overflow-x: hidden; overflow-y: auto; diff --git a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js index 1b1701c1f4..c120c8fd52 100644 --- a/webroot/rsrc/js/application/core/behavior-phabricator-nav.js +++ b/webroot/rsrc/js/application/core/behavior-phabricator-nav.js @@ -102,10 +102,19 @@ JX.behavior('phabricator-nav', function(config) { }); + function resetdrag() { + local.style.width = ''; + background.style.width = ''; + drag.style.left = ''; + content.style.marginLeft = ''; + } + var collapsed = false; JX.Stratcom.listen('differential-filetree-toggle', null, function(e) { collapsed = !collapsed; JX.DOM.alterClass(main, 'has-local-nav', !collapsed); + resetdrag(); + }); @@ -135,11 +144,7 @@ JX.behavior('phabricator-nav', function(config) { // - Navigation Reset ---------------------------------------------------------- JX.Stratcom.listen('phabricator-device-change', null, function(event) { - local.style.width = ''; - background.style.width = ''; - drag.style.left = ''; - content.style.marginLeft = ''; - + resetdrag(); onresize(); });