From 1483c13a3c6ef6a68cd0b45c0e93228c7b84ca91 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 21 Nov 2014 16:40:27 +0000 Subject: [PATCH] fix links for clips without clipLayer annotations --- static/js/clipList.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/static/js/clipList.js b/static/js/clipList.js index d60d37dd..abbd76e3 100644 --- a/static/js/clipList.js +++ b/static/js/clipList.js @@ -138,7 +138,8 @@ pandora.ui.clipList = function(videoRatio) { copy: function(data) { var items = data.ids.map(function(id) { var item = !ui.item ? id.split('/')[0] : ui.item, - annotation = that.value(id, 'annotations')[0].id; + annotations = that.value(id, 'annotations') || [], + annotation = annotations.length ? annotations[0].id : null; return annotation || item + '/' + that.value(id, 'in') + '-' + that.value(id, 'out'); }) pandora.clipboard.copy(items, 'clip'); @@ -146,7 +147,8 @@ pandora.ui.clipList = function(videoRatio) { copyadd: function(data) { var items = data.ids.map(function(id) { var item = !ui.item ? id.split('/')[0] : ui.item, - annotation = that.value(id, 'annotations')[0].id; + annotations = that.value(id, 'annotations') || [], + annotation = annotations.length ? annotations[0].id : null; return annotation || item + '/' + that.value(id, 'in') + '-' + that.value(id, 'out'); }) pandora.clipboard.add(items, 'clip'); @@ -162,7 +164,8 @@ pandora.ui.clipList = function(videoRatio) { open: function(data) { var id = data.ids[0], item = !ui.item ? id.split('/')[0] : ui.item, - annotation = that.value(id, 'annotations')[0].id, + annotations = that.value(id, 'annotations') || [], + annotation = annotations.length ? annotations[0].id : null; points = { annotation: annotation ? annotation.split('/')[1] : '', 'in': that.value(id, 'in'),