sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

update css (collapse panel extras, video editor bars, video find element)

Browse source
This commit is contained in:
rlx 2011-11-03 12:14:18 +00:00
commit b056a22172
3 changed files with 80 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

114
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -31,6 +31,7 @@ Ox.VideoEditor = function(options, self) {
out: 0,
position: 0,
posterFrame: 0,
posterFrameControls: false,
showAnnotations: false,
showLargeTimeline: true,
subtitles: [],
@ -312,7 +313,7 @@ Ox.VideoEditor = function(options, self) {
);
});
self.$keyboardShortcuts = $('<div>');
self.$keyboardShortcuts = $('<div>').css({margin: '16px'});
[
{key: Ox.UI.symbols.space, action: 'Play/Pause'},
{key: 'P', action: 'Play In to Out'},
@ -373,20 +374,18 @@ Ox.VideoEditor = function(options, self) {
self.resolutions,
[
{},
{id: 'largeTimeline', title: 'Hide Large Timeline'},
{id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline'},
{id: 'largeTimeline', title: 'Hide Large Timeline', disabled: true},
{id: 'subtitlesTimeline', title: 'Hide Subtitles on Large Timeline', disabled: true},
{},
{id: 'linkSelection', title: 'Link to Selection...'},
{id: 'embed', title: 'Embed Selection...'},
{id: 'downloadSelection', title: 'Download Selection...'},
{id: 'downloadVideo', title: 'Download Video...', disabled: true},
{id: 'downloadSelection', title: 'Download Selection...', disabled: true},
{id: 'embedSelection', title: 'Embed Selection...', disabled: true},
{},
{id: 'keyboard', title: 'Keyboard Shortcuts...', keyboard: 'h'}
]
),
selectable: false,
title: $('<img>').attr({
src: Ox.UI.getImageURL('symbolSet')
}),
title: 'set',
tooltip: 'Actions and Settings',
type: 'image'
})
@ -442,56 +441,57 @@ Ox.VideoEditor = function(options, self) {
});
//.appendTo(self.$videobar);
if (self.options.posterFrameControls) {
//$('<div>').css({float: 'left', width: '8px', height: '1px'}).appendTo(self.$videobar.$element);
self.$goToPosterButton = Ox.Button({
style: 'symbol',
title: 'goToPoster',
tooltip: 'Go to Poster Frame',
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
setPosition(self.options.posterFrame);
}
})
.appendTo(self.$videobar);
self.$goToPosterButton = Ox.Button({
style: 'symbol',
title: 'goToPoster',
tooltip: 'Go to Poster Frame',
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
setPosition(self.options.posterFrame);
}
})
.appendTo(self.$videobar);
self.$setPosterButton = Ox.Button({
disabled: true,
style: 'symbol',
title: 'setPoster',
tooltip: 'Set Poster Frame',
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
self.$goToPosterButton.toggleDisabled();
self.$setPosterButton.toggleDisabled();
self.$unlockPosterButton.toggleTitle();
}
})
.appendTo(self.$videobar);
self.$setPosterButton = Ox.Button({
disabled: true,
style: 'symbol',
title: 'setPoster',
tooltip: 'Set Poster Frame',
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
self.$goToPosterButton.toggleDisabled();
self.$setPosterButton.toggleDisabled();
self.$unlockPosterButton.toggleTitle();
}
})
.appendTo(self.$videobar);
self.$unlockPosterButton = Ox.Button({
style: 'symbol',
title: [
{id: 'lock', title: 'lock'},
{id: 'unlock', title: 'unlock', selected: true}
],
tooltip: ['Lock Poster Frame', 'Unlock Poster Frame'],
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
self.$setPosterButton.toggleDisabled();
}
})
.appendTo(self.$videobar);
self.$unlockPosterButton = Ox.Button({
style: 'symbol',
title: [
{id: 'lock', title: 'lock'},
{id: 'unlock', title: 'unlock', selected: true}
],
tooltip: ['Lock Poster Frame', 'Unlock Poster Frame'],
type: 'image'
})
.css({float: 'left'})
.bindEvent({
click: function() {
self.$setPosterButton.toggleDisabled();
}
})
.appendTo(self.$videobar);
}
self.$clearButton = Ox.Button({
disabled: self.options.find === '',
@ -601,9 +601,7 @@ Ox.VideoEditor = function(options, self) {
],
max: 2,
title: $('<img>').attr({
src: Ox.UI.getImageURL('symbolSet')
}),
title: 'set',
tooltip: 'Actions and Settings',
type: 'image'
})