forked from 0x2620/pandora
fix parsing url parsing of id/annotation, closes #2635
This commit is contained in:
parent
649cdbd792
commit
0485a95b2f
1 changed files with 2 additions and 2 deletions
|
@ -1609,7 +1609,7 @@ pandora.getSpan = function(state, val, callback) {
|
|||
});
|
||||
} else {
|
||||
isName = val[0] == '@';
|
||||
isVideoView = pandora.isVideoView(state.view);
|
||||
isVideoView = pandora.isVideoView(state.view, state.item);
|
||||
canBeAnnotation = state.item && (!state.view || isVideoView) && !isName;
|
||||
canBeEvent = !state.view || state.view == 'calendar';
|
||||
canBePlace = !state.view || state.view == 'map';
|
||||
|
@ -1618,7 +1618,7 @@ pandora.getSpan = function(state, val, callback) {
|
|||
if (id) {
|
||||
Ox.Log('URL', 'id?', id)
|
||||
state.span = id;
|
||||
state.view = pandora.user.ui.videoView;
|
||||
state.view = state.view || pandora.user.ui.videoView;
|
||||
callback();
|
||||
} else {
|
||||
getId(canBePlace ? 'place' : '', function(id) {
|
||||
|
|
Loading…
Reference in a new issue