decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

refactor URL.js

Browse source
This commit is contained in:
rolux 2011-11-05 13:27:17 +00:00
parent d67a1cdfba
commit 64bac326eb
1 changed files with 39 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,61 +5,34 @@ pandora.URL = (function() {
var self = {}, that = {}; var self = {}, that = {};
function getState(keys) { function getState(keys) {
Ox.Log('', 'GET STATE, UI', pandora.user.ui)
Ox.Log('GET STATE, UI', pandora.user.ui)
var state = {}; var state = {};
/*
if (keys.indexOf('type') > -1) {
state.type = pandora.user.ui.section == 'items'
? pandora.site.itemsSection
: pandora.user.ui.section;
}
*/
state.type = pandora.site.itemsSection; state.type = pandora.site.itemsSection;
if (!keys || keys.indexOf('item') > -1) {
state.item = pandora.user.ui.item; state.item = pandora.user.ui.item;
if (pandora.user.ui.item) {
state.view = pandora.user.ui.itemView;
}
}
if (!keys || keys.indexOf('listView') > -1 || keys.indexOf('itemView') > -1) {
if (!pandora.user.ui.item) { if (!pandora.user.ui.item) {
state.view = pandora.user.ui.listView; state.view = pandora.user.ui.listView;
state.sort = pandora.user.ui.listSort; state.sort = pandora.user.ui.listSort;
state.find = pandora.user.ui.find;
} else { } else {
state.item = pandora.user.ui.item;
state.view = pandora.user.ui.itemView; state.view = pandora.user.ui.itemView;
state.sort = pandora.user.ui.itemSort; state.sort = pandora.user.ui.itemSort;
} }
}
if (!keys || keys.indexOf('mapSelection') > -1) { if (state.view == 'map') {
state.item = pandora.user.ui.item;
state.view = 'map';
state.span = pandora.user.ui.mapSelection
? '@' + pandora.user.ui.mapSelection : '';
state.sort = !pandora.user.ui.item
? pandora.user.ui.listSort : pandora.user.ui.itemSort;
}
if (!keys || keys.indexOf('mapFind') > -1) {
state.item = pandora.user.ui.item;
state.view = 'map';
state.span = pandora.user.ui.mapFind state.span = pandora.user.ui.mapFind
? '@' + pandora.user.ui.mapFind : ''; ? '@' + pandora.user.ui.mapFind
state.sort = !pandora.user.ui.item : pandora.user.ui.mapSelection
? pandora.user.ui.listSort : pandora.user.ui.itemSort; ? '@' + pandora.user.ui.mapSelection
} : '';
if (!keys || keys.filter(function(key) { } else if (state.view == 'calendar') {
return /^videoPoints/.test(key); // ...
}).length) { } else if (['video', 'timeline'].indexOf(state.view) > -1) {
var videoPoints = pandora.user.ui.videoPoints; var videoPoints = pandora.user.ui.videoPoints[state.item] || {};
state.item = pandora.user.ui.item;
state.view = pandora.user.ui.itemView;
state.span = [];
if (
pandora.user.ui.item
&& ['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1
&& videoPoints[pandora.user.ui.item]
) {
videoPoints = videoPoints[pandora.user.ui.item];
state.span = Ox.merge( state.span = Ox.merge(
videoPoints.position videoPoints.position
? videoPoints.position ? videoPoints.position
@ -69,45 +42,11 @@ pandora.URL = (function() {
: [] : []
); );
} }
}
if (!keys || keys.indexOf('listSort') > -1 || keys.indexOf('itemSort') > -1) { Ox.Log('STATE .................... ->', state)
if (!pandora.user.ui.item) {
state.view = pandora.user.ui.listView;
state.sort = pandora.user.ui.listSort;
} else {
state.item = pandora.user.ui.item;
state.view = pandora.user.ui.itemView;
state.sort = pandora.user.ui.itemSort;
}
if (state.view == 'map') {
if (pandora.user.ui.mapSelection) {
state.span = '@' + pandora.user.ui.mapSelection;
} else if (pandora.user.ui.mapFind) {
state.span = '@' + pandora.user.ui.mapFind;
}
}
/*
: pandora.isClipView(pandora.user.ui.itemView)
? pandora.user.ui.itemSort : [],
*/
}
if (!state.item) {
state.find = pandora.user.ui.find;
}
if (!keys || keys.indexOf('find') > -1) {
if (!pandora.user.ui.item) {
state.view = pandora.user.ui.listView;
state.sort = pandora.user.ui.listSort;
state.find = pandora.user.ui.find;
} else {
state.item = pandora.user.ui.item;
state.view = pandora.user.ui.itemView;
state.sort = pandora.user.ui.itemSort;
state.find = pandora.user.ui.itemFind;
}
}
Ox.Log('', 'STATE .................... ->', state)
return state; return state;
} }
function setState(state, callback) { function setState(state, callback) {
@ -387,7 +326,7 @@ pandora.URL = (function() {
that.update = function(keys) { that.update = function(keys) {
Ox.Log('', 'update.........', keys) Ox.Log('', 'update.........', keys)
// this gets called from pandora.UI // this gets called from pandora.UI
var action; var action, state;
if (!keys) { if (!keys) {
// may get called from home screen too // may get called from home screen too
keys = !pandora.user.ui.item keys = !pandora.user.ui.item
@ -411,7 +350,8 @@ pandora.URL = (function() {
} else { } else {
action = 'push'; action = 'push';
} }
self.URL[action](getState(), pandora.getPageTitle(), getState(/*keys*/)); state = getState();
self.URL[action](state, pandora.getPageTitle(), state);
} }
}; };