make /2000 behave slightly less wrong
This commit is contained in:
parent
d9d1a600a9
commit
be717933e4
6 changed files with 20 additions and 8 deletions
|
@ -731,6 +731,8 @@
|
|||
"annotationsRange": "all",
|
||||
"annotationsSize": 256,
|
||||
"annotationsSort": "position",
|
||||
"calendarFind": "",
|
||||
"calendarSelection": "",
|
||||
"clipsColumns": 2,
|
||||
"columns": {
|
||||
"Colors": {
|
||||
|
|
|
@ -751,6 +751,8 @@
|
|||
"annotationsRange": "all",
|
||||
"annotationsSize": 256,
|
||||
"annotationsSort": "position",
|
||||
"calendarFind": "",
|
||||
"calendarSelection": "",
|
||||
"clipsColumns": 2,
|
||||
"columns": {
|
||||
"Colors": {
|
||||
|
|
|
@ -648,6 +648,8 @@
|
|||
"annotationsRange": "position",
|
||||
"annotationsSize": 256,
|
||||
"annotationsSort": "position",
|
||||
"calendarFind": "",
|
||||
"calendarSelection": "",
|
||||
"clipsColumns": 2,
|
||||
"columns": {
|
||||
"Colors": {
|
||||
|
|
|
@ -569,6 +569,8 @@
|
|||
"annotationsRange": "all",
|
||||
"annotationsSize": 256,
|
||||
"annotationsSort": "position",
|
||||
"calendarFind": "",
|
||||
"calendarSelection": "",
|
||||
"clipsColumns": 2,
|
||||
"columns": {
|
||||
"Colors": {
|
||||
|
|
|
@ -159,16 +159,19 @@ pandora.URL = (function() {
|
|||
} else if (state.view == 'map') {
|
||||
// fixme: this doesn't handle map coordinates
|
||||
if (state.span[0] != '@') {
|
||||
//pandora.user.ui.mapSelection = state.span;
|
||||
set['mapSelection'] = state.span;
|
||||
set['mapFind'] = '';
|
||||
set.mapSelection = state.span;
|
||||
set.mapFind = '';
|
||||
} else {
|
||||
//pandora.user.ui.mapFind = state.span.slice(1);
|
||||
set['mapFind'] = state.span.slice(1);
|
||||
set['mapSelection'] = '';
|
||||
set.mapFind = state.span.slice(1);
|
||||
set.mapSelection = '';
|
||||
}
|
||||
} 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];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -173,13 +173,14 @@ pandora.ui.navigationView = function(type, videoRatio) {
|
|||
}, function(result) {
|
||||
that.replaceElement(0,
|
||||
$element = Ox.Calendar({
|
||||
date: new Date(0),
|
||||
date: new Date(ui.calendarFind || 0),
|
||||
events: result.data.items,
|
||||
// 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item)
|
||||
height: !ui.item
|
||||
? window.innerHeight - ui.showFilters * ui.filtersSize - 61
|
||||
: window.innerHeight - ui.showBrowser * (112 + Ox.UI.SCROLLBAR_SIZE) - 45,
|
||||
range: [-5000, 5000],
|
||||
selected: ui.calendarSelection,
|
||||
showControls: ui.showCalendarControls,
|
||||
showToolbar: true,
|
||||
showZoombar: true,
|
||||
|
|
Loading…
Reference in a new issue