From b4f7c498edcd4f7f8497a0dfdf3f83bebd23ff3a Mon Sep 17 00:00:00 2001 From: rolux Date: Mon, 17 Sep 2012 08:38:44 +0000 Subject: [PATCH] use custom split panel tooltips in player, timeline, editor (fixes #972) --- static/js/pandora/editor.js | 2 +- static/js/pandora/player.js | 3 ++- static/js/pandora/timeline.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js index a95ed74c..30386bfd 100644 --- a/static/js/pandora/editor.js +++ b/static/js/pandora/editor.js @@ -13,6 +13,7 @@ pandora.ui.editor = function(data) { annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, annotationsSort: ui.annotationsSort, + annotationsTooltip: 'annotations ' + Ox.SYMBOLS.SHIFT + 'A', censored: data.censored, censoredIcon: pandora.site.cantPlay.icon, censoredTooltip: pandora.site.cantPlay.text, @@ -58,7 +59,6 @@ pandora.ui.editor = function(data) { subtitles: data.subtitles, timeline: ui.videoTimeline, timelines: pandora.site.timelines, - tooltips: true, video: data.video, videoRatio: data.videoRatio, videoSize: ui.videoSize, diff --git a/static/js/pandora/player.js b/static/js/pandora/player.js index d5d795fa..122a7300 100644 --- a/static/js/pandora/player.js +++ b/static/js/pandora/player.js @@ -13,6 +13,7 @@ pandora.ui.player = function(data) { annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, annotationsSort: ui.annotationsSort, + annotationsTooltip: 'annotations ' + Ox.SYMBOLS.SHIFT + 'A', censored: data.censored, censoredIcon: pandora.site.cantPlay.icon, censoredTooltip: pandora.site.cantPlay.text, @@ -45,7 +46,7 @@ pandora.ui.player = function(data) { smallTimelineURL: '/' + ui.item + '/timeline16p.jpg', subtitles: data.subtitles, timeline: ui.videoTimeline, - tooltips: true, + timelineTooltip: 'timeline ' + Ox.SYMBOLS.SHIFT + 'T', video: data.video, volume: ui.videoVolume, width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1 diff --git a/static/js/pandora/timeline.js b/static/js/pandora/timeline.js index 51a03372..9f8d7892 100644 --- a/static/js/pandora/timeline.js +++ b/static/js/pandora/timeline.js @@ -13,6 +13,7 @@ pandora.ui.timeline = function(data) { annotationsRange: ui.annotationsRange, annotationsSize: ui.annotationsSize, annotationsSort: ui.annotationsSort, + annotationsTooltip: 'annotations ' + Ox.SYMBOLS.SHIFT + 'A', censored: data.censored, censoredIcon: pandora.site.cantPlay.icon, censoredTooltip: pandora.site.cantPlay.text,