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

Fix an issue with returning to a the initial page in Quicksand

Browse source 
Summary: Fixes T7058. We weren't propagating `state` properly so some other code ended up doing the wrong thing.

Test Plan:
  - Clicked from Home -> Anything -> Home under Quicksand, saw reloads with no double requests.
  - Used "back", saw back button work properly.

Reviewers: btrahan, chad

Reviewed By: chad

Subscribers: epriestley

Maniphest Tasks: T7058

Differential Revision: https://secure.phabricator.com/D12190
This commit is contained in:
epriestley 2015-03-28 07:38:14 -07:00
parent 95efd50470
commit ad1bed136c
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
resources/celerity/map.php
View file

@ -8,7 +8,7 @@
return array( return array(
'names' => array( 'names' => array(
'core.pkg.css' => '2ff29d1d', 'core.pkg.css' => '2ff29d1d',
'core.pkg.js' => '2102d953', 'core.pkg.js' => 'c5888f3d',
'darkconsole.pkg.js' => '8ab24e01', 'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '571b1cc1', 'differential.pkg.css' => '571b1cc1',
'differential.pkg.js' => 'c0506961', 'differential.pkg.js' => 'c0506961',
@ -199,7 +199,7 @@ return array(
'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '6ea96ac9', 'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '6ea96ac9',
'rsrc/externals/javelin/lib/Cookie.js' => '62dfea03', 'rsrc/externals/javelin/lib/Cookie.js' => '62dfea03',
'rsrc/externals/javelin/lib/DOM.js' => '6f7962d5', 'rsrc/externals/javelin/lib/DOM.js' => '6f7962d5',
'rsrc/externals/javelin/lib/History.js' => '2e0148bc', 'rsrc/externals/javelin/lib/History.js' => 'd4505101',
'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',
@ -663,7 +663,7 @@ return array(
'javelin-dynval' => 'f6555212', 'javelin-dynval' => 'f6555212',
'javelin-event' => '85ea0626', 'javelin-event' => '85ea0626',
'javelin-fx' => '54b612ba', 'javelin-fx' => '54b612ba',
'javelin-history' => '2e0148bc', 'javelin-history' => 'd4505101',
'javelin-install' => '05270951', 'javelin-install' => '05270951',
'javelin-json' => '69adf288', 'javelin-json' => '69adf288',
'javelin-leader' => '331b1611', 'javelin-leader' => '331b1611',
@ -1046,12 +1046,6 @@ return array(
'javelin-install', 'javelin-install',
'javelin-event', 'javelin-event',
), ),
'2e0148bc' => array(
'javelin-stratcom',
'javelin-install',
'javelin-uri',
'javelin-util',
),
'316b8fa1' => array( '316b8fa1' => array(
'javelin-install', 'javelin-install',
'javelin-typeahead-source', 'javelin-typeahead-source',
@ -1776,6 +1770,12 @@ return array(
'd254d646' => array( 'd254d646' => array(
'javelin-util', 'javelin-util',
), ),
'd4505101' => array(
'javelin-stratcom',
'javelin-install',
'javelin-uri',
'javelin-util',
),
'd4a14807' => array( 'd4a14807' => array(
'javelin-install', 'javelin-install',
'javelin-dom', 'javelin-dom',

2
webroot/rsrc/externals/javelin/lib/History.js vendored
View file

@ -131,7 +131,7 @@ JX.install('History', {
JX.History._initialPath = null; JX.History._initialPath = null;
} }
history.pushState(state || null, null, path); history.pushState(state || null, null, path);
JX.History._fire(path); JX.History._fire(path, state);
} else { } else {
location.hash = JX.History._composeFragment(path); location.hash = JX.History._composeFragment(path);
} }