Page MenuHomePhabricator
Files F13991217

D11487.id27633.diff
No OneTemporary
Actions

D11487.id27633.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -166,7 +166,7 @@
'rsrc/externals/javelin/core/__tests__/install.js' => 'c432ee85',
'rsrc/externals/javelin/core/__tests__/stratcom.js' => '88bf7313',
'rsrc/externals/javelin/core/__tests__/util.js' => 'e251703d',
- 'rsrc/externals/javelin/core/init.js' => '8c4e8f8b',
+ 'rsrc/externals/javelin/core/init.js' => '4df97779',
'rsrc/externals/javelin/core/init_node.js' => 'c234aded',
'rsrc/externals/javelin/core/install.js' => '05270951',
'rsrc/externals/javelin/core/util.js' => '93cc50d6',
@@ -199,7 +199,7 @@
'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
'rsrc/externals/javelin/lib/Router.js' => '29274e2b',
- 'rsrc/externals/javelin/lib/Scrollbar.js' => '8ebeb833',
+ 'rsrc/externals/javelin/lib/Scrollbar.js' => 'ad2c4a94',
'rsrc/externals/javelin/lib/URI.js' => '6eff08aa',
'rsrc/externals/javelin/lib/Vector.js' => 'cc1bd0b0',
'rsrc/externals/javelin/lib/WebSocket.js' => '3f840822',
@@ -663,7 +663,7 @@
'javelin-install' => '05270951',
'javelin-json' => '69adf288',
'javelin-leader' => '331b1611',
- 'javelin-magical-init' => '8c4e8f8b',
+ 'javelin-magical-init' => '4df97779',
'javelin-mask' => '8a41885b',
'javelin-reactor' => '2b8de964',
'javelin-reactor-dom' => 'c90a04fc',
@@ -673,7 +673,7 @@
'javelin-resource' => '44959b73',
'javelin-routable' => 'b3e7d692',
'javelin-router' => '29274e2b',
- 'javelin-scrollbar' => '8ebeb833',
+ 'javelin-scrollbar' => 'ad2c4a94',
'javelin-stratcom' => '8b0ad945',
'javelin-tokenizer' => '7644823e',
'javelin-typeahead' => '70baed2f',
@@ -1468,12 +1468,6 @@
'javelin-stratcom',
'javelin-behavior',
),
- '8ebeb833' => array(
- 'javelin-install',
- 'javelin-dom',
- 'javelin-stratcom',
- 'javelin-vector',
- ),
'8ef9ab58' => array(
'javelin-behavior',
'javelin-dom',
@@ -1582,6 +1576,12 @@
'javelin-util',
'phabricator-prefab',
),
+ 'ad2c4a94' => array(
+ 'javelin-install',
+ 'javelin-dom',
+ 'javelin-stratcom',
+ 'javelin-vector',
+ ),
'ad7a69ca' => array(
'javelin-install',
'javelin-util',
diff --git a/webroot/rsrc/externals/javelin/core/init.js b/webroot/rsrc/externals/javelin/core/init.js
--- a/webroot/rsrc/externals/javelin/core/init.js
+++ b/webroot/rsrc/externals/javelin/core/init.js
@@ -132,7 +132,6 @@
'mousedown',
'mouseover',
'mouseout',
- 'mouseup',
'keyup',
'keydown',
'input',
@@ -172,8 +171,8 @@
JX.enableDispatch(root, document_events[ii]);
}
- // In particular, we're interested in capturing window focus/blur here so
- // long polls can abort when the window is not focused.
+ // In particular, we're interested in capturing window focus/blur here so
+ // long polls can abort when the window is not focused.
var window_events = [
('onpagehide' in window) ? 'pagehide' : 'unload',
'resize',
@@ -181,7 +180,12 @@
'focus',
'blur',
'popstate',
- 'hashchange'
+ 'hashchange',
+
+ // In Firefox, if the user clicks in the window then drags the cursor
+ // outside of the window and releases the mouse button, we don't get this
+ // event unless we listen for it as a window event.
+ 'mouseup'
];
if (window.localStorage) {
diff --git a/webroot/rsrc/externals/javelin/lib/Scrollbar.js b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
--- a/webroot/rsrc/externals/javelin/lib/Scrollbar.js
+++ b/webroot/rsrc/externals/javelin/lib/Scrollbar.js
@@ -238,6 +238,9 @@
*/
_ondrop: function() {
this._dragOrigin = null;
+
+ // Reset the timer to hide the bar.
+ this._showBar();
},
@@ -293,6 +296,12 @@
* Hide the scrollbar.
*/
_hideBar: function() {
+ if (this._dragOrigin !== null) {
+ // If we're currently dragging the handle, we never want to hide
+ // it.
+ return;
+ }
+
JX.DOM.alterClass(this._handle, 'jx-scrollbar-visible', false);
this._clearTimeout();
},

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 23, 9:19 AM (3 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6717906
Default Alt Text
D11487.id27633.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility