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' => 'b4a7e275', - 'core.pkg.js' => '771b0e84', + 'core.pkg.js' => '17380dd3', 'darkconsole.pkg.js' => 'e7393ebb', 'differential.pkg.css' => '2de124c9', 'differential.pkg.js' => 'd0cd0df6', @@ -447,7 +447,7 @@ 'rsrc/js/application/uiexample/notification-example.js' => '8ce821c5', 'rsrc/js/core/Busy.js' => '59a7976a', 'rsrc/js/core/DragAndDropFileUpload.js' => '81f182b5', - 'rsrc/js/core/DraggableList.js' => '8199fb41', + 'rsrc/js/core/DraggableList.js' => '705df8d1', 'rsrc/js/core/FileUpload.js' => '680ea2c8', 'rsrc/js/core/Hovercard.js' => '1bd28176', 'rsrc/js/core/KeyboardShortcut.js' => '1ae869f2', @@ -742,7 +742,7 @@ 'phabricator-countdown-css' => 'e7544472', 'phabricator-dashboard-css' => 'eb458607', 'phabricator-drag-and-drop-file-upload' => '81f182b5', - 'phabricator-draggable-list' => '8199fb41', + 'phabricator-draggable-list' => '705df8d1', 'phabricator-fatal-config-template-css' => '8e6c6fcd', 'phabricator-feed-css' => 'ecd4ec57', 'phabricator-file-upload' => '680ea2c8', @@ -1352,6 +1352,14 @@ 'javelin-typeahead', 'javelin-uri', ), + '705df8d1' => array( + 'javelin-install', + 'javelin-dom', + 'javelin-stratcom', + 'javelin-util', + 'javelin-vector', + 'javelin-magical-init', + ), '70baed2f' => array( 'javelin-install', 'javelin-dom', @@ -1441,14 +1449,6 @@ 'javelin-vector', 'javelin-stratcom', ), - '8199fb41' => array( - 'javelin-install', - 'javelin-dom', - 'javelin-stratcom', - 'javelin-util', - 'javelin-vector', - 'javelin-magical-init', - ), '81f182b5' => array( 'javelin-install', 'javelin-util', diff --git a/src/view/phui/PHUIWorkboardView.php b/src/view/phui/PHUIWorkboardView.php --- a/src/view/phui/PHUIWorkboardView.php +++ b/src/view/phui/PHUIWorkboardView.php @@ -29,7 +29,7 @@ 'div', array( 'class' => 'phui-workboard-view-shadow', - 'sigil' => 'workboard-shadow lock-scroll-while-dragging', + 'sigil' => 'workboard-shadow lock-scroll-y-while-dragging', ), $view); diff --git a/webroot/rsrc/js/core/DraggableList.js b/webroot/rsrc/js/core/DraggableList.js --- a/webroot/rsrc/js/core/DraggableList.js +++ b/webroot/rsrc/js/core/DraggableList.js @@ -664,14 +664,21 @@ // In Safari, we'll eventually reach `window.document`, which is not // sufficently node-like to support sigil tests. - var lock; + var lock = false; if (container === window.document) { lock = false; } else { // Some elements may respond to, e.g., `scrollTop` adjustment, even // though they are not scrollable. This sigil disables adjustment // for them. - lock = JX.Stratcom.hasSigil(container, 'lock-scroll-while-dragging'); + var lock_sigil; + if (property == 'scrollTop') { + lock_sigil = 'lock-scroll-y-while-dragging'; + } + + if (lock_sigil) { + lock = JX.Stratcom.hasSigil(container, lock_sigil); + } } if (!lock) {