Page MenuHomePhabricator
Files F15493104

D12485.diff
No OneTemporary
Actions

D12485.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
@@ -205,7 +205,7 @@
'rsrc/externals/javelin/lib/JSON.js' => '69adf288',
'rsrc/externals/javelin/lib/Leader.js' => '331b1611',
'rsrc/externals/javelin/lib/Mask.js' => '8a41885b',
- 'rsrc/externals/javelin/lib/Quicksand.js' => 'd15f0293',
+ 'rsrc/externals/javelin/lib/Quicksand.js' => '8750a840',
'rsrc/externals/javelin/lib/Request.js' => '94b750d2',
'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
@@ -677,7 +677,7 @@
'javelin-leader' => '331b1611',
'javelin-magical-init' => '3010e992',
'javelin-mask' => '8a41885b',
- 'javelin-quicksand' => 'd15f0293',
+ 'javelin-quicksand' => '8750a840',
'javelin-reactor' => '2b8de964',
'javelin-reactor-dom' => 'c90a04fc',
'javelin-reactor-node-calmer' => '76f4ebed',
@@ -1482,6 +1482,9 @@
'aphront-typeahead-control-css',
'phui-tag-view-css',
),
+ '8750a840' => array(
+ 'javelin-install',
+ ),
'87cb6b51' => array(
'javelin-behavior',
'javelin-dom',
@@ -1793,9 +1796,6 @@
'javelin-stratcom',
'phabricator-phtize',
),
- 'd15f0293' => array(
- 'javelin-install',
- ),
'd19198c8' => array(
'javelin-install',
'javelin-dom',
diff --git a/webroot/rsrc/externals/javelin/lib/Quicksand.js b/webroot/rsrc/externals/javelin/lib/Quicksand.js
--- a/webroot/rsrc/externals/javelin/lib/Quicksand.js
+++ b/webroot/rsrc/externals/javelin/lib/Quicksand.js
@@ -151,7 +151,7 @@
var id = ++self._id;
self._history.push({path: path, id: id});
- JX.History.push(path, id);
+ JX.History.push(path, {quicksand: id});
self._cursor = (self._history.length - 1);
self._responses[id] = null;
@@ -256,7 +256,7 @@
var self = JX.Quicksand;
var data = e.getData();
- data.state = data.state || null;
+ data.state = (data.state && data.state.quicksand) || null;
// Check if we're going back to the first page we started Quicksand on.
// We don't have a state value, but can look at the path.

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 13, 9:32 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7381676
Default Alt Text
D12485.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility