From 671ef01245368dfb47b047c2854dc7514a6453a5 Mon Sep 17 00:00:00 2001 From: rolux Date: Wed, 12 Feb 2014 12:27:41 +0000 Subject: [PATCH] update pandora.getItemIdAndPosition --- static/js/utils.js | 48 ++++++++++++++++++++++++++-------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/static/js/utils.js b/static/js/utils.js index 39ce87e51..40a90a36e 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1245,28 +1245,34 @@ pandora.getItemIdAndPosition = function() { position: ui.videoPoints[itemId] ? ui.videoPoints[itemId].position : 0 }; } - if (!ui.item) { - if ( - ui.listView == 'timelines' - && (selected = ui.listSelection).length == 1 - ) { - ret = getIdAndPositionByItemId(selected[0]); - } else if ( - ['clip', 'map', 'calendar'].indexOf(ui.listView) > -1 - && pandora.$ui.clipList - && (selected = pandora.$ui.clipList.options('selected')).length == 1 - ) { - ret = getIdAndPositionByClipId(selected[0]); + if (ui.section == 'items') { + if (!ui.item) { + if ( + ui.listView == 'timelines' + && (selected = ui.listSelection).length == 1 + ) { + ret = getIdAndPositionByItemId(selected[0]); + } else if ( + ['clip', 'map', 'calendar'].indexOf(ui.listView) > -1 + && pandora.$ui.clipList + && (selected = pandora.$ui.clipList.options('selected')).length == 1 + ) { + ret = getIdAndPositionByClipId(selected[0]); + } + } else { + if (pandora.isVideoView()) { + ret = getIdAndPositionByItemId(ui.item); + } else if ( + ['clips', 'map', 'calendar'].indexOf(ui.itemView) > -1 + && pandora.$ui.clipList + && (selected = pandora.$ui.clipList.options('selected')).length == 1 + ) { + ret = getIdAndPositionByClipId(selected[0]); + } } - } else { - if (pandora.isVideoView()) { - ret = getIdAndPositionByItemId(ui.item); - } else if ( - ['clips', 'map', 'calendar'].indexOf(ui.itemView) > -1 - && pandora.$ui.clipList - && (selected = pandora.$ui.clipList.options('selected')).length == 1 - ) { - ret = getIdAndPositionByClipId(selected[0]); + } else if (ui.section == 'edits') { + if (ui.edit) { + // TODO } } return ret;