remove new for all Ox.Elements, dont declare arguments again, add some semicolons
This commit is contained in:
parent
3eab11e967
commit
b27ed00356
69 changed files with 430 additions and 440 deletions
|
|
@ -11,8 +11,8 @@ Ox.LargeTimeline <f:Ox.Element> LargeTimeline Object
|
|||
|
||||
Ox.LargeTimeline = function(options, self) {
|
||||
|
||||
var self = self || {},
|
||||
that = new Ox.Element({}, self)
|
||||
self = self || {};
|
||||
var that = Ox.Element({}, self)
|
||||
.defaults({
|
||||
cuts: [],
|
||||
duration: 0,
|
||||
|
|
@ -40,7 +40,7 @@ Ox.LargeTimeline = function(options, self) {
|
|||
$markerPoint: [],
|
||||
$subtitles: [],
|
||||
$tiles: {},
|
||||
$tooltip: new Ox.Tooltip({
|
||||
$tooltip: Ox.Tooltip({
|
||||
animate: false
|
||||
}),
|
||||
center: parseInt(self.options.width / 2),
|
||||
|
|
@ -55,7 +55,7 @@ Ox.LargeTimeline = function(options, self) {
|
|||
.css({
|
||||
left: self.center + 'px'
|
||||
})
|
||||
.appendTo(that.$element)
|
||||
.appendTo(that.$element);
|
||||
|
||||
self.options.subtitles.forEach(function(v, i) {
|
||||
self.$subtitles[i] = $('<div>')
|
||||
|
|
@ -65,7 +65,7 @@ Ox.LargeTimeline = function(options, self) {
|
|||
width: (((v['out'] - v['in']) * self.fps) - 2) + 'px'
|
||||
})
|
||||
.html(Ox.highlight(v.value, self.options.find, 'OxHighlight'))
|
||||
.appendTo(self.$timeline)
|
||||
.appendTo(self.$timeline);
|
||||
});
|
||||
|
||||
self.options.cuts.forEach(function(v, i) {
|
||||
|
|
@ -77,7 +77,7 @@ Ox.LargeTimeline = function(options, self) {
|
|||
.css({
|
||||
left: (v * self.fps) + 'px'
|
||||
})
|
||||
.appendTo(self.$timeline)
|
||||
.appendTo(self.$timeline);
|
||||
});
|
||||
|
||||
self.$markerPosition = $('<img>')
|
||||
|
|
@ -124,7 +124,7 @@ Ox.LargeTimeline = function(options, self) {
|
|||
}
|
||||
|
||||
function getPosition(e) {
|
||||
return self.options.position + (e.clientX - that.offset().left - self.center - 1) / self.fps
|
||||
return self.options.position + (e.clientX - that.offset().left - self.center - 1) / self.fps;
|
||||
}
|
||||
|
||||
function mouseleave(e) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue