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

appendTo(that.$element) -> appendTo(that)

Browse source
This commit is contained in:
rolux 2012-06-26 18:21:39 +02:00
commit 244591d57e
13 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ Ox.BlockVideoTimeline = function(options, self) {
src: Ox.UI.getImageURL('markerPosition')
})
.addClass('OxMarkerPosition')
.appendTo(that.$element);
.appendTo(that);
setPositionMarker();
if (self.options.showPointMarkers) {
@ -96,7 +96,7 @@ Ox.BlockVideoTimeline = function(options, self) {
.attr({
src: Ox.UI.getImageURL('marker' + titlecase)
})
.appendTo(that.$element);
.appendTo(that);
setPointMarker(point);
});
}
@ -111,7 +111,7 @@ Ox.BlockVideoTimeline = function(options, self) {
height: '24px',
overflow: 'hidden'
})
.appendTo(that.$element);
.appendTo(that);
self.$images[i] = self.$image.clone()
.css({
position: 'absolute',

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

@ -115,14 +115,14 @@ Ox.SmallVideoTimeline = function(options, self) {
self.$positionMarker = $('<div>')
.addClass('OxMarkerPlay' + (self.options.paused ? ' OxPaused' : ''))
.append($('<div>').append($('<div>')))
.appendTo(that.$element);
.appendTo(that);
} else {
self.$positionMarker = $('<img>')
.addClass('OxMarkerPosition')
.attr({
src: Ox.UI.getImageURL('markerPosition')
})
.appendTo(that.$element);
.appendTo(that);
}
setPositionMarker();
@ -135,7 +135,7 @@ Ox.SmallVideoTimeline = function(options, self) {
.attr({
src: Ox.UI.getImageURL('marker' + titlecase)
})
.appendTo(that.$element);
.appendTo(that);
setPointMarker(point);
});
}

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

@ -125,7 +125,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
width: self.options.width + 'px',
height: self.imageHeight + 'px'
})
.appendTo(that.$element);
.appendTo(that);
self.$results = $('<img>')
.attr({
@ -137,7 +137,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
width: self.options.width + 'px',
height: self.imageHeight + 'px'
})
.appendTo(that.$element);
.appendTo(that);
self.$selection = $('<img>')
.attr({
@ -149,7 +149,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
width: self.options.width + 'px',
height: self.imageHeight + 'px'
})
.appendTo(that.$element);
.appendTo(that);
function getImageURL(image, callback) {
var width = image == 'results' || image == 'selection'

8
source/Ox.UI/js/Video/VideoEditorPlayer.js
View file

@ -65,12 +65,12 @@ Ox.VideoEditorPlayer = function(options, self) {
height: self.options.height + 'px',
width: self.options.width + 'px'
})
.appendTo(that.$element)
.appendTo(that);
}
self.$subtitle = $('<div>')
.addClass('OxSubtitle')
.appendTo(that.$element);
.appendTo(that);
setSubtitleSize();
@ -101,7 +101,7 @@ Ox.VideoEditorPlayer = function(options, self) {
})
)
.hide()
.appendTo(that.$element);
.appendTo(that);
self.$markerPoint = {};
['in', 'out'].forEach(function(point, i) {
@ -114,7 +114,7 @@ Ox.VideoEditorPlayer = function(options, self) {
src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
})
.hide()
.appendTo(that.$element);
.appendTo(that);
if (self.options.points[i] == self.options.position) {
self.$markerPoint[point][edge].show();
}

4
source/Ox.UI/js/Video/VideoElement.js
View file

@ -157,7 +157,7 @@ Ox.VideoElement = function(options, self) {
autoplay: 'autoplay'
} : {}))
.hide()
.appendTo(that.$element);
.appendTo(that);
});
item.videos = item.$videos.map(function($video) {
return $video[0];
@ -168,7 +168,7 @@ Ox.VideoElement = function(options, self) {
background: 'rgb(0, 0, 0)',
opacity: 0
})
.appendTo(that.$element);
.appendTo(that);
return item;
}

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

@ -361,7 +361,7 @@ Ox.VideoPlayer = function(options, self) {
.css({
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0
})
.appendTo(that.$element)
.appendTo(that)
if (self.options.type == 'play') {
@ -585,7 +585,7 @@ Ox.VideoPlayer = function(options, self) {
opacity: self.options.externalControls ? 1 : 0
})
.css(edge, 0)
.appendTo(that.$element);
.appendTo(that);
self.options['controls' + titleCase].forEach(function(control) {
@ -844,7 +844,7 @@ Ox.VideoPlayer = function(options, self) {
})
.appendTo(self['$controls' + titleCase]);
self.$settings = renderSettings().appendTo(that.$element);
self.$settings = renderSettings().appendTo(that);
} else if (control == 'size') {
@ -974,7 +974,7 @@ Ox.VideoPlayer = function(options, self) {
.css({
top: self.options.controlsTop.length ? '16px' : 0
})
.appendTo(that.$element);
.appendTo(that);
self.$results = Ox.Element({
tooltip: 'Results'
@ -1081,7 +1081,7 @@ Ox.VideoPlayer = function(options, self) {
.css({
bottom: self.options.controlsBottom.length ? '16px' : 0
})
.appendTo(that.$element);
.appendTo(that);
self.$hideVolumeButton = Ox.Button({
style: 'symbol',

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

@ -50,7 +50,7 @@ Ox.VideoPreview = function(options, self) {
self.$frameElement = $('<div>')
.addClass('OxFrame')
.appendTo(that.$element)
.appendTo(that);
self.$frame = $('<img>')
.attr({src: self.options.getFrame(self.options.position)})
@ -62,7 +62,7 @@ Ox.VideoPreview = function(options, self) {
.addClass('OxTimeline')
.attr({src: self.options.timeline})
.css({width: self.options.width + 'px'})
.appendTo(that.$element);
.appendTo(that);
}
self.$interface = Ox.Element({
@ -86,7 +86,7 @@ Ox.VideoPreview = function(options, self) {
self.$frame.attr({src: self.options.getFrame(self.options.position)});
}
})
.appendTo(that.$element);
.appendTo(that);
function click(e) {
that.triggerEvent('click', {