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

make /2000 behave slightly less wrong

Browse source
This commit is contained in:
rolux 2013-03-06 14:09:18 +00:00
parent d9d1a600a9
commit be717933e4
6 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/config.0xdb.jsonc
View file

@ -731,6 +731,8 @@
"annotationsRange": "all", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"calendarFind": "",
"calendarSelection": "",
"clipsColumns": 2, "clipsColumns": 2,
"columns": { "columns": {
"Colors": { "Colors": {

2
pandora/config.indiancinema.jsonc
View file

@ -751,6 +751,8 @@
"annotationsRange": "all", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"calendarFind": "",
"calendarSelection": "",
"clipsColumns": 2, "clipsColumns": 2,
"columns": { "columns": {
"Colors": { "Colors": {

2
pandora/config.padma.jsonc
View file

@ -648,6 +648,8 @@
"annotationsRange": "position", "annotationsRange": "position",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"calendarFind": "",
"calendarSelection": "",
"clipsColumns": 2, "clipsColumns": 2,
"columns": { "columns": {
"Colors": { "Colors": {

2
pandora/config.pandora.jsonc
View file

@ -569,6 +569,8 @@
"annotationsRange": "all", "annotationsRange": "all",
"annotationsSize": 256, "annotationsSize": 256,
"annotationsSort": "position", "annotationsSort": "position",
"calendarFind": "",
"calendarSelection": "",
"clipsColumns": 2, "clipsColumns": 2,
"columns": { "columns": {
"Colors": { "Colors": {

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

@ -159,16 +159,19 @@ pandora.URL = (function() {
} else if (state.view == 'map') { } else if (state.view == 'map') {
// fixme: this doesn't handle map coordinates // fixme: this doesn't handle map coordinates
if (state.span[0] != '@') { if (state.span[0] != '@') {
//pandora.user.ui.mapSelection = state.span; set.mapSelection = state.span;
set['mapSelection'] = state.span; set.mapFind = '';
set['mapFind'] = '';
} else { } else {
//pandora.user.ui.mapFind = state.span.slice(1); set.mapFind = state.span.slice(1);
set['mapFind'] = state.span.slice(1); set.mapSelection = '';
set['mapSelection'] = '';
} }
} else if (state.view == 'calendar') { } else if (state.view == 'calendar') {
// ... // fixme: this is still very much unclear
if (state.span.length == 1 && /^\d/.test(state.span)) {
set.calendarFind = state.span[0];
} else if (state.span.length == 2) {
set.calendarFind = state.span[0];
}
} }
} }

3
static/js/pandora/navigationView.js
View file

@ -173,13 +173,14 @@ pandora.ui.navigationView = function(type, videoRatio) {
}, function(result) { }, function(result) {
that.replaceElement(0, that.replaceElement(0,
$element = Ox.Calendar({ $element = Ox.Calendar({
date: new Date(0), date: new Date(ui.calendarFind || 0),
events: result.data.items, events: result.data.items,
// 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item) // 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item)
height: !ui.item height: !ui.item
? window.innerHeight - ui.showFilters * ui.filtersSize - 61 ? window.innerHeight - ui.showFilters * ui.filtersSize - 61
: window.innerHeight - ui.showBrowser * (112 + Ox.UI.SCROLLBAR_SIZE) - 45, : window.innerHeight - ui.showBrowser * (112 + Ox.UI.SCROLLBAR_SIZE) - 45,
range: [-5000, 5000], range: [-5000, 5000],
selected: ui.calendarSelection,
showControls: ui.showCalendarControls, showControls: ui.showCalendarControls,
showToolbar: true, showToolbar: true,
showZoombar: true, showZoombar: true,