mirror/php-h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-08-09 15:26:46 +02:00
Code Issues Releases Wiki Activity

Refactor location module.

Browse Source
This commit is contained in:
Lars Jung
2015-04-29 00:44:10 +02:00
parent 2525ad8393
commit 6500b624f5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/_h5ai/client/js/inc/core/location.js
View File

@@ -178,17 +178,17 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/event', 'core/notify',
} }
} }
function onPopState(ev) {
if (history) { if (ev.state && ev.state.absHref) {
window.onpopstate = function (ev) { setLocation(ev.state.absHref, true);
}
if (ev.state && ev.state.absHref) {
setLocation(ev.state.absHref, true);
}
};
} }
window.onpopstate = history ? onPopState : null;
return { return {
forceEncoding: forceEncoding, forceEncoding: forceEncoding,
getDomain: getDomain, getDomain: getDomain,

8
test/tests/unit/core/location.js
View File

@@ -86,7 +86,7 @@ describe('module \'' + ID + '\'', function () {
assert.lengthOfKeys(instance, 7); assert.lengthOfKeys(instance, 7);
}); });
it('sets window.onpopstate when history and fastBrowsing', function () { it('sets window.onpopstate function when history and fastBrowsing', function () {
this.xModernizr.history = true; this.xModernizr.history = true;
this.xSettings.view.fastBrowsing = true; this.xSettings.view.fastBrowsing = true;
@@ -96,7 +96,7 @@ describe('module \'' + ID + '\'', function () {
assert.isFunction(window.onpopstate); assert.isFunction(window.onpopstate);
}); });
it('does not set window.onpopstate when not history and fastBrowsing', function () { it('sets window.onpopstate to null when not history and fastBrowsing', function () {
this.xModernizr.history = false; this.xModernizr.history = false;
this.xSettings.view.fastBrowsing = true; this.xSettings.view.fastBrowsing = true;
@@ -106,7 +106,7 @@ describe('module \'' + ID + '\'', function () {
assert.isNull(window.onpopstate); assert.isNull(window.onpopstate);
}); });
it('does not set window.onpopstate when history and not fastBrowsing', function () { it('sets window.onpopstate to null when history and not fastBrowsing', function () {
this.xModernizr.history = true; this.xModernizr.history = true;
this.xSettings.view.fastBrowsing = false; this.xSettings.view.fastBrowsing = false;
@@ -116,7 +116,7 @@ describe('module \'' + ID + '\'', function () {
assert.isNull(window.onpopstate); assert.isNull(window.onpopstate);
}); });
it('does not set window.onpopstate when not history and not fastBrowsing', function () { it('sets window.onpopstate to null when not history and not fastBrowsing', function () {
this.xModernizr.history = false; this.xModernizr.history = false;
this.xSettings.view.fastBrowsing = false; this.xSettings.view.fastBrowsing = false;