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

fix parsing url parsing of id/annotation, closes #2635

Browse source
This commit is contained in:
j 2014-12-26 12:03:42 +00:00
parent 649cdbd792
commit 0485a95b2f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
static/js/utils.js
View file

@ -1609,7 +1609,7 @@ pandora.getSpan = function(state, val, callback) {
}); });
} else { } else {
isName = val[0] == '@'; isName = val[0] == '@';
isVideoView = pandora.isVideoView(state.view); isVideoView = pandora.isVideoView(state.view, state.item);
canBeAnnotation = state.item && (!state.view || isVideoView) && !isName; canBeAnnotation = state.item && (!state.view || isVideoView) && !isName;
canBeEvent = !state.view || state.view == 'calendar'; canBeEvent = !state.view || state.view == 'calendar';
canBePlace = !state.view || state.view == 'map'; canBePlace = !state.view || state.view == 'map';
@ -1618,7 +1618,7 @@ pandora.getSpan = function(state, val, callback) {
if (id) { if (id) {
Ox.Log('URL', 'id?', id) Ox.Log('URL', 'id?', id)
state.span = id; state.span = id;
state.view = pandora.user.ui.videoView; state.view = state.view || pandora.user.ui.videoView;
callback(); callback();
} else { } else {
getId(canBePlace ? 'place' : '', function(id) { getId(canBePlace ? 'place' : '', function(id) {