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

use svg video markers

Browse source
This commit is contained in:
rlx 2011-09-02 00:32:23 +00:00
commit 9a7a0acd89
24 changed files with 55 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js
View file

@ -62,12 +62,12 @@ Ox.BlockVideoTimeline = function(options, self) {
self.$positionMarker = $('<img>')
.attr({
src: Ox.UI.PATH + 'png/videoMarkerPlay.png'
src: Ox.UI.getImageURL('markerPlay')
})
.css({
position: 'absolute',
width: '9px',
height: '5px',
height: '9px',
zIndex: 10
})
.appendTo(that.$element);
@ -75,11 +75,11 @@ Ox.BlockVideoTimeline = function(options, self) {
self.$pointMarker = {};
['in', 'out'].forEach(function(point) {
var titleCase = Ox.toTitleCase(point);
var titlecase = Ox.toTitleCase(point);
self.$pointMarker[point] = $('<img>')
.addClass('OxPointMarker' + titleCase)
.addClass('OxPointMarker' + titlecase)
.attr({
src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
src: Ox.UI.getImageURL('marker' + titlecase)
})
.css({
position: 'absolute',

6
source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js
View file

@ -64,7 +64,7 @@ Ox.LargeVideoTimeline = function(options, self) {
self.$cuts[i] = $('<img>')
.addClass('OxCut')
.attr({
src: Ox.UI.PATH + 'png/videoMarkerCut.png'
src: Ox.UI.getImageURL('markerCut')
})
.css({
left: (v * self.fps) + 'px'
@ -75,7 +75,7 @@ Ox.LargeVideoTimeline = function(options, self) {
self.$markerPosition = $('<img>')
.addClass('OxMarkerPosition')
.attr({
src: Ox.UI.PATH + 'png/videoMarkerPlay.png'
src: Ox.UI.getImageURL('markerPlay')
})
.appendTo(that.$element);
setMarker();
@ -85,7 +85,7 @@ Ox.LargeVideoTimeline = function(options, self) {
self.$pointMarker[point] = $('<img>')
.addClass('OxMarkerPoint' + titlecase)
.attr({
src: Ox.UI.PATH + 'png/videoMarker' + titlecase + '.png'
src: Ox.UI.getImageURL('marker' + titlecase)
})
.appendTo(self.$timeline);
setPointMarker(point);

10
source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js
View file

@ -100,13 +100,13 @@ Ox.SmallVideoTimeline = function(options, self) {
} else {
self.$positionMarker = $('<img>')
.attr({
src: Ox.UI.PATH + 'png/videoMarkerPlay.png'
src: Ox.UI.getImageURL('markerPlay')
})
.css({
position: 'absolute',
top: '2px',
width: '9px',
height: '5px',
height: '9px',
zIndex: 10
})
.appendTo(that.$element);
@ -116,11 +116,11 @@ Ox.SmallVideoTimeline = function(options, self) {
if (self.options.type == 'editor') {
self.$pointMarker = {};
['in', 'out'].forEach(function(point) {
var titleCase = Ox.toTitleCase(point);
var titlecase = Ox.toTitleCase(point);
self.$pointMarker[point] = $('<img>')
.addClass('OxPointMarker' + titleCase)
.addClass('OxPointMarker' + titlecase)
.attr({
src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
src: Ox.UI.getImageURL('marker' + titlecase)
})
.css({
position: 'absolute',

2
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -410,7 +410,7 @@ Ox.VideoPlayer = function(options, self) {
self.$pointMarker[point][edge] = $('<img>')
.addClass('OxPointMarker OxPointMarker' + titleCase)
.attr({
src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
src: Ox.UI.getImageURL('marker' + titleCase)
})
.appendTo(self.$videoContainer);
});