kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-24 03:55:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor($browser): more test coverage around history.state manipulation

Browse Source 
Check that pushState is not invoked if $browser.url() and $browser.state()
is passed to $browser.url setter.

Also, a minor refactor in $browser.url code and $browser specs.

Refs #9587
This commit is contained in:
Michał Gołębiowski
2014-10-13 19:04:00 +02:00
committed by Igor Minar
parent 28133cbd2a
commit 4a85512174
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ng/browser.js
View File

@@ -165,10 +165,12 @@ function Browser(window, document, $log, $sniffer) {
// setter
if (url) {
var sameState = lastHistoryState === state;
// Don't change anything if previous and current URLs and states match. This also prevents
// IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
// See https://github.com/angular/angular.js/commit/ffb2701
if (lastBrowserUrl === url && (!$sniffer.history || cachedState === state)) {
if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
return;
}
var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
@@ -178,9 +180,10 @@ function Browser(window, document, $log, $sniffer) {
// due to a bug in IE10/IE11 which leads
// to not firing a `hashchange` nor `popstate` event
// in some cases (see #9143).
if ($sniffer.history && (!sameBase || cachedState !== state)) {
if ($sniffer.history && (!sameBase || !sameState)) {
history[replace ? 'replaceState' : 'pushState'](state, '', url);
cacheState();
// Do the assignment again so that those two variables are referentially identical.
lastHistoryState = cachedState;
} else {
if (!sameBase) {