0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

use custom split panel tooltips in player, timeline, editor (fixes #972)

Browse source
This commit is contained in:
rolux 2012-09-17 08:38:44 +00:00
parent eeed6f3216
commit b4f7c498ed
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
static/js/pandora/editor.js
View file

@ -13,6 +13,7 @@ pandora.ui.editor = function(data) {
annotationsRange: ui.annotationsRange, annotationsRange: ui.annotationsRange,
annotationsSize: ui.annotationsSize, annotationsSize: ui.annotationsSize,
annotationsSort: ui.annotationsSort, annotationsSort: ui.annotationsSort,
annotationsTooltip: 'annotations <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>',
censored: data.censored, censored: data.censored,
censoredIcon: pandora.site.cantPlay.icon, censoredIcon: pandora.site.cantPlay.icon,
censoredTooltip: pandora.site.cantPlay.text, censoredTooltip: pandora.site.cantPlay.text,
@ -58,7 +59,6 @@ pandora.ui.editor = function(data) {
subtitles: data.subtitles, subtitles: data.subtitles,
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
timelines: pandora.site.timelines, timelines: pandora.site.timelines,
tooltips: true,
video: data.video, video: data.video,
videoRatio: data.videoRatio, videoRatio: data.videoRatio,
videoSize: ui.videoSize, videoSize: ui.videoSize,

3
static/js/pandora/player.js
View file

@ -13,6 +13,7 @@ pandora.ui.player = function(data) {
annotationsRange: ui.annotationsRange, annotationsRange: ui.annotationsRange,
annotationsSize: ui.annotationsSize, annotationsSize: ui.annotationsSize,
annotationsSort: ui.annotationsSort, annotationsSort: ui.annotationsSort,
annotationsTooltip: 'annotations <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>',
censored: data.censored, censored: data.censored,
censoredIcon: pandora.site.cantPlay.icon, censoredIcon: pandora.site.cantPlay.icon,
censoredTooltip: pandora.site.cantPlay.text, censoredTooltip: pandora.site.cantPlay.text,
@ -45,7 +46,7 @@ pandora.ui.player = function(data) {
smallTimelineURL: '/' + ui.item + '/timeline16p.jpg', smallTimelineURL: '/' + ui.item + '/timeline16p.jpg',
subtitles: data.subtitles, subtitles: data.subtitles,
timeline: ui.videoTimeline, timeline: ui.videoTimeline,
tooltips: true, timelineTooltip: 'timeline <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'T</span>',
video: data.video, video: data.video,
volume: ui.videoVolume, volume: ui.videoVolume,
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1 width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1

1
static/js/pandora/timeline.js
View file

@ -13,6 +13,7 @@ pandora.ui.timeline = function(data) {
annotationsRange: ui.annotationsRange, annotationsRange: ui.annotationsRange,
annotationsSize: ui.annotationsSize, annotationsSize: ui.annotationsSize,
annotationsSort: ui.annotationsSort, annotationsSort: ui.annotationsSort,
annotationsTooltip: 'annotations <span class="OxBright">' + Ox.SYMBOLS.SHIFT + 'A</span>',
censored: data.censored, censored: data.censored,
censoredIcon: pandora.site.cantPlay.icon, censoredIcon: pandora.site.cantPlay.icon,
censoredTooltip: pandora.site.cantPlay.text, censoredTooltip: pandora.site.cantPlay.text,