0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

URL controller: don't store ui.hash

Browse source
This commit is contained in:
rolux 2013-07-12 12:32:45 +02:00
parent 0a2e07f338
commit 34c0e98798
1 changed files with 8 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
static/js/pandora/URL.js
View file

@ -63,20 +63,6 @@ pandora.URL = (function() {
} }
if (
pandora.user.ui.hash && (
pandora.user.ui.hash.anchor || !Ox.isEmpty(pandora.user.ui.hash.query)
)
) {
state.hash = {};
if (pandora.user.ui.hash.anchor) {
state.hash.anchor = pandora.user.ui.hash.anchor;
}
if (!Ox.isEmpty(pandora.user.ui.hash.query)) {
state.hash.query = pandora.user.ui.hash.query;
}
}
Ox.Log('URL', 'GOT STATE ...', state) Ox.Log('URL', 'GOT STATE ...', state)
return state; return state;
@ -100,27 +86,15 @@ pandora.URL = (function() {
} else { } else {
if (state.hash) { if (
set.hash = state.hash; state.hash
if (!state.hash.anchor) { && !Ox.contains(['embed', 'print'], state.hash.anchor)
state.hash.anchor = ''; && state.hash.query
} ) {
if (state.hash.query) {
if (state.hash.query.embed === true) {
// ...
} else if (state.hash.query.print == true) {
// ...
} else {
state.hash.query.forEach(function(kv) { state.hash.query.forEach(function(kv) {
set[kv.key] = kv.value; set[kv.key] = kv.value;
}); });
} }
} else {
set.hash.query = [];
}
} else {
set.hash = Ox.clone(pandora.site.user.ui.hash, true);
}
if (state.page) { if (state.page) {