revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-18 21:02:41 +01:00
Code Issues Releases Wiki Activity

Possible fix for JX.History spookiness?

Browse source 
Summary: Ref T7573. I only got this reproducing like 10% of the time in Firefox but I can't reproduce it anymore after this change.

Test Plan:
  - Added some logging.
  - Saw Firefox handing us nonsense state values (?)
  - Read the Firefox documentation?
  - Maybe state is expected to be an object? This shouldn't matter?
  - I don't really know?

iiam

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T7573

Differential Revision: https://secure.phabricator.com/D12485
This commit is contained in:
epriestley 2015-04-20 16:41:19 -07:00
parent 4d5badeec0
commit 1602858b26
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/celerity/map.php
View file

@ -205,7 +205,7 @@ return array(
'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 @@ return array(
'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 @@ return array(
'aphront-typeahead-control-css',
'phui-tag-view-css',
),
'8750a840' => array(
'javelin-install',
),
'87cb6b51' => array(
'javelin-behavior',
'javelin-dom',
@ -1793,9 +1796,6 @@ return array(
'javelin-stratcom',
'phabricator-phtize',
),
'd15f0293' => array(
'javelin-install',
),
'd19198c8' => array(
'javelin-install',
'javelin-dom',

4
webroot/rsrc/externals/javelin/lib/Quicksand.js vendored
View file

@ -151,7 +151,7 @@ JX.install('Quicksand', {
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 @@ JX.install('Quicksand', {
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.