diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 87bc02214d..b6cf443b35 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -13,7 +13,7 @@ return array( 'core.pkg.js' => '1475bd91', 'darkconsole.pkg.js' => '1f9a31bc', 'differential.pkg.css' => '9ebe4f44', - 'differential.pkg.js' => '78b8497f', + 'differential.pkg.js' => '40f4acb3', 'diffusion.pkg.css' => 'b93d9b8c', 'diffusion.pkg.js' => '84c8f8fd', 'favicon.ico' => '30672e08', @@ -392,7 +392,7 @@ return array( 'rsrc/js/application/dashboard/behavior-dashboard-query-panel-select.js' => '453c5375', 'rsrc/js/application/dashboard/behavior-dashboard-tab-panel.js' => 'd4eecc63', 'rsrc/js/application/diff/DiffChangeset.js' => '3359ad02', - 'rsrc/js/application/diff/DiffChangesetList.js' => '675f1ca3', + 'rsrc/js/application/diff/DiffChangesetList.js' => 'b42eb5ff', 'rsrc/js/application/diff/DiffInline.js' => '45d37835', 'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832', 'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07', @@ -778,7 +778,7 @@ return array( 'phabricator-darkmessage' => 'c48cccdd', 'phabricator-dashboard-css' => 'fe5b1869', 'phabricator-diff-changeset' => '3359ad02', - 'phabricator-diff-changeset-list' => '675f1ca3', + 'phabricator-diff-changeset-list' => 'b42eb5ff', 'phabricator-diff-inline' => '45d37835', 'phabricator-drag-and-drop-file-upload' => '58dea2fa', 'phabricator-draggable-list' => 'bea6e7f4', @@ -1412,9 +1412,6 @@ return array( 'javelin-workflow', 'javelin-dom', ), - '675f1ca3' => array( - 'javelin-install', - ), '680ea2c8' => array( 'javelin-install', 'javelin-dom', @@ -1822,6 +1819,9 @@ return array( 'b3e7d692' => array( 'javelin-install', ), + 'b42eb5ff' => array( + 'javelin-install', + ), 'b59e1e96' => array( 'javelin-behavior', 'javelin-stratcom', diff --git a/webroot/rsrc/js/application/diff/DiffChangesetList.js b/webroot/rsrc/js/application/diff/DiffChangesetList.js index 0b9fa612a0..60575e2aa2 100644 --- a/webroot/rsrc/js/application/diff/DiffChangesetList.js +++ b/webroot/rsrc/js/application/diff/DiffChangesetList.js @@ -68,7 +68,7 @@ JX.install('DiffChangesetList', { var onrangedown = JX.bind(this, this._ifawake, this._onrangedown); JX.Stratcom.listen( - ['touchstart', 'mousedown'], + 'mousedown', ['differential-changeset', 'tag:th'], onrangedown); @@ -78,15 +78,9 @@ JX.install('DiffChangesetList', { ['differential-changeset', 'tag:th'], onrangemove); - var onrangetouchmove = JX.bind(this, this._ifawake, this._onrangetouchmove); - JX.Stratcom.listen( - 'touchmove', - null, - onrangetouchmove); - var onrangeup = JX.bind(this, this._ifawake, this._onrangeup); JX.Stratcom.listen( - ['touchend', 'mouseup'], + 'mouseup', null, onrangeup); }, @@ -1147,8 +1141,8 @@ JX.install('DiffChangesetList', { }, _onrangedown: function(e) { - // NOTE: We're allowing touch events through, including "touchstart". We - // need to kill the "touchstart" event so the page doesn't scroll. + // NOTE: We're allowing "mousedown" from a touch event through so users + // can leave inlines on a single line. if (e.isRightButton()) { return; } @@ -1238,31 +1232,6 @@ JX.install('DiffChangesetList', { this._setHoverRange(this._rangeOrigin, this._rangeTarget); }, - _onrangetouchmove: function(e) { - if (!this._rangeActive) { - return; - } - - // NOTE: The target of a "touchmove" event is bogus. Use dark magic to - // identify the actual target. Some day, this might move into the core - // libraries. If this doesn't work, just bail. - - var target; - try { - var raw_event = e.getRawEvent(); - var touch = raw_event.touches[0]; - target = document.elementFromPoint(touch.clientX, touch.clientY); - } catch (ex) { - return; - } - - if (!JX.DOM.isType(target, 'th')) { - return; - } - - this._updateRange(target, false); - }, - _onrangeup: function(e) { if (!this._rangeActive) { return;