revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-18 19:40:55 +01:00
Code Issues Releases Wiki Activity

Quicksand - fix spooky back button issue

Browse source 
Summary: Fixes T7911.

Test Plan:
 - load a page
 - click something else
 - go back to original page via clicking
 - browser refresh
 - click something else
 - browser back -- and it now works!

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Maniphest Tasks: T7911

Differential Revision: https://secure.phabricator.com/D12603
This commit is contained in:
Bob Trahan 2015-04-28 17:20:32 -07:00
parent 39954c1eb6
commit 6575cc568d
2 changed files with 8 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/JSON.js' => '69adf288',
'rsrc/externals/javelin/lib/Leader.js' => '331b1611', 'rsrc/externals/javelin/lib/Leader.js' => '331b1611',
'rsrc/externals/javelin/lib/Mask.js' => '8a41885b', 'rsrc/externals/javelin/lib/Mask.js' => '8a41885b',
'rsrc/externals/javelin/lib/Quicksand.js' => '51aeb01d', 'rsrc/externals/javelin/lib/Quicksand.js' => '7ba665f5',
'rsrc/externals/javelin/lib/Request.js' => '94b750d2', 'rsrc/externals/javelin/lib/Request.js' => '94b750d2',
'rsrc/externals/javelin/lib/Resource.js' => '44959b73', 'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692', 'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
@ -675,7 +675,7 @@ return array(
'javelin-leader' => '331b1611', 'javelin-leader' => '331b1611',
'javelin-magical-init' => '3010e992', 'javelin-magical-init' => '3010e992',
'javelin-mask' => '8a41885b', 'javelin-mask' => '8a41885b',
'javelin-quicksand' => '51aeb01d', 'javelin-quicksand' => '7ba665f5',
'javelin-reactor' => '2b8de964', 'javelin-reactor' => '2b8de964',
'javelin-reactor-dom' => 'c90a04fc', 'javelin-reactor-dom' => 'c90a04fc',
'javelin-reactor-node-calmer' => '76f4ebed', 'javelin-reactor-node-calmer' => '76f4ebed',
@ -1190,9 +1190,6 @@ return array(
'javelin-dom', 'javelin-dom',
'javelin-reactor-dom', 'javelin-reactor-dom',
), ),
'51aeb01d' => array(
'javelin-install',
),
'54b612ba' => array( '54b612ba' => array(
'javelin-color', 'javelin-color',
'javelin-install', 'javelin-install',
@ -1416,6 +1413,9 @@ return array(
'javelin-stratcom', 'javelin-stratcom',
'javelin-util', 'javelin-util',
), ),
'7ba665f5' => array(
'javelin-install',
),
'7cbe244b' => array( '7cbe244b' => array(
'javelin-install', 'javelin-install',
'javelin-util', 'javelin-util',

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

@ -51,6 +51,7 @@ JX.install('Quicksand', {
self._started = true; self._started = true;
var path = self._getRelativeURI(window.location); var path = self._getRelativeURI(window.location);
self._id = window.history.state || 0;
var id = self._id; var id = self._id;
self._history.push({path: path, id: id}); self._history.push({path: path, id: id});
@ -155,7 +156,7 @@ JX.install('Quicksand', {
var id = ++self._id; var id = ++self._id;
self._history.push({path: path, id: id}); self._history.push({path: path, id: id});
JX.History.push(path, {quicksand: id}); JX.History.push(path, id);
self._cursor = (self._history.length - 1); self._cursor = (self._history.length - 1);
self._responses[id] = null; self._responses[id] = null;
@ -262,7 +263,7 @@ JX.install('Quicksand', {
var self = JX.Quicksand; var self = JX.Quicksand;
var data = e.getData(); var data = e.getData();
data.state = (data.state && data.state.quicksand) || null; data.state = data.state || null;
// Check if we're going back to the first page we started Quicksand on. // 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. // We don't have a state value, but can look at the path.