0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

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

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

4
source/Ox.UI/js/Form/Editable.js
View file

@ -151,13 +151,13 @@ Ox.Editable = function(options, self) {
}, },
submit: submit submit: submit
}) })
.appendTo(that.$element); .appendTo(that);
self.$input.find('input').css(self.css); self.$input.find('input').css(self.css);
self.$test = self.$value.$element.clone() self.$test = self.$value.$element.clone()
.css(Ox.extend({display: 'inline-block'}, self.css)) .css(Ox.extend({display: 'inline-block'}, self.css))
.html(formatTestValue()) .html(formatTestValue())
.css({background: 'rgb(192, 192, 192)'}) .css({background: 'rgb(192, 192, 192)'})
.appendTo(that.$element); .appendTo(that);
} }
self.minWidth = 8; self.minWidth = 8;
self.maxWidth = that.parent().width(); self.maxWidth = that.parent().width();

4
source/Ox.UI/js/Form/Input.js
View file

@ -285,7 +285,7 @@ Ox.Input = function(options, self) {
.blur(blur) .blur(blur)
.change(change) .change(change)
.focus(focus) .focus(focus)
.appendTo(that.$element); .appendTo(that);
if (self.options.type == 'textarea') { if (self.options.type == 'textarea') {
Ox.Log('Form', 'TEXTAREA', self.options.width, self.options.height, '...', that.css('width'), that.css('height'), '...', self.$input.css('width'), self.$input.css('height'), '...', self.$input.css('border')) Ox.Log('Form', 'TEXTAREA', self.options.width, self.options.height, '...', that.css('width'), that.css('height'), '...', self.$input.css('width'), self.$input.css('height'), '...', self.$input.css('border'))
@ -339,7 +339,7 @@ Ox.Input = function(options, self) {
}) })
.val(self.options.placeholder) .val(self.options.placeholder)
.focus(focus) .focus(focus)
.appendTo(that.$element); .appendTo(that);
} }
if (self.options.autocomplete && self.options.autocompleteSelect) { if (self.options.autocomplete && self.options.autocompleteSelect) {

4
source/Ox.UI/js/Form/Range.js
View file

@ -97,7 +97,7 @@ Ox.Range = function(options, self) {
clickArrow(data, i, false); clickArrow(data, i, false);
} }
}) })
.appendTo(that.$element); .appendTo(that);
}); });
} }
@ -114,7 +114,7 @@ Ox.Range = function(options, self) {
}, self.options.changeOnDrag ? {} : { }, self.options.changeOnDrag ? {} : {
dragend: dragendTrack dragend: dragendTrack
})) }))
.appendTo(that.$element); .appendTo(that);
self.trackColors && setTrackColors(); self.trackColors && setTrackColors();

4
source/Ox.UI/js/Menu/MainMenu.js
View file

@ -37,7 +37,7 @@ Ox.MainMenu = function(options, self) {
if (self.options.extras.length) { if (self.options.extras.length) {
that.extras = $('<div>') that.extras = $('<div>')
.addClass('OxExtras') .addClass('OxExtras')
.appendTo(that.$element); .appendTo(that);
self.options.extras.forEach(function(extra) { self.options.extras.forEach(function(extra) {
extra.css({ extra.css({
float: 'left' // fixme: need class! float: 'left' // fixme: need class!
@ -52,7 +52,7 @@ Ox.MainMenu = function(options, self) {
.data('position', position); .data('position', position);
if (position == 0) { if (position == 0) {
if (that.titles.length == 1) { if (that.titles.length == 1) {
that.titles[position].appendTo(that.$element); that.titles[position].appendTo(that);
} else { } else {
that.titles[position].insertBefore(that.titles[1]); that.titles[position].insertBefore(that.titles[1]);
} }

10
source/Ox.UI/js/Menu/Menu.js
View file

@ -87,21 +87,21 @@ Ox.Menu = function(options, self) {
that.$scrollbars = []; that.$scrollbars = [];
that.$top = $('<div>') that.$top = $('<div>')
.addClass('OxTop') .addClass('OxTop')
.appendTo(that.$element); .appendTo(that);
that.$scrollbars.up = renderScrollbar('up') that.$scrollbars.up = renderScrollbar('up')
.appendTo(that.$element); .appendTo(that);
that.$container = $('<div>') that.$container = $('<div>')
.addClass('OxContainer') .addClass('OxContainer')
.appendTo(that.$element); .appendTo(that);
that.$content = $('<table>') that.$content = $('<table>')
.addClass('OxContent') .addClass('OxContent')
.appendTo(that.$container); .appendTo(that.$container);
renderItems(self.options.items); renderItems(self.options.items);
that.$scrollbars.down = renderScrollbar('down') that.$scrollbars.down = renderScrollbar('down')
.appendTo(that.$element); .appendTo(that);
that.$bottom = $('<div>') that.$bottom = $('<div>')
.addClass('OxBottom') .addClass('OxBottom')
.appendTo(that.$element); .appendTo(that);
function click(event) { function click(event) {
var item, var item,

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

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

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

@ -115,14 +115,14 @@ Ox.SmallVideoTimeline = function(options, self) {
self.$positionMarker = $('<div>') self.$positionMarker = $('<div>')
.addClass('OxMarkerPlay' + (self.options.paused ? ' OxPaused' : '')) .addClass('OxMarkerPlay' + (self.options.paused ? ' OxPaused' : ''))
.append($('<div>').append($('<div>'))) .append($('<div>').append($('<div>')))
.appendTo(that.$element); .appendTo(that);
} else { } else {
self.$positionMarker = $('<img>') self.$positionMarker = $('<img>')
.addClass('OxMarkerPosition') .addClass('OxMarkerPosition')
.attr({ .attr({
src: Ox.UI.getImageURL('markerPosition') src: Ox.UI.getImageURL('markerPosition')
}) })
.appendTo(that.$element); .appendTo(that);
} }
setPositionMarker(); setPositionMarker();
@ -135,7 +135,7 @@ Ox.SmallVideoTimeline = function(options, self) {
.attr({ .attr({
src: Ox.UI.getImageURL('marker' + titlecase) src: Ox.UI.getImageURL('marker' + titlecase)
}) })
.appendTo(that.$element); .appendTo(that);
setPointMarker(point); 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', width: self.options.width + 'px',
height: self.imageHeight + 'px' height: self.imageHeight + 'px'
}) })
.appendTo(that.$element); .appendTo(that);
self.$results = $('<img>') self.$results = $('<img>')
.attr({ .attr({
@ -137,7 +137,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
width: self.options.width + 'px', width: self.options.width + 'px',
height: self.imageHeight + 'px' height: self.imageHeight + 'px'
}) })
.appendTo(that.$element); .appendTo(that);
self.$selection = $('<img>') self.$selection = $('<img>')
.attr({ .attr({
@ -149,7 +149,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
width: self.options.width + 'px', width: self.options.width + 'px',
height: self.imageHeight + 'px' height: self.imageHeight + 'px'
}) })
.appendTo(that.$element); .appendTo(that);
function getImageURL(image, callback) { function getImageURL(image, callback) {
var width = image == 'results' || image == 'selection' 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', height: self.options.height + 'px',
width: self.options.width + 'px' width: self.options.width + 'px'
}) })
.appendTo(that.$element) .appendTo(that);
} }
self.$subtitle = $('<div>') self.$subtitle = $('<div>')
.addClass('OxSubtitle') .addClass('OxSubtitle')
.appendTo(that.$element); .appendTo(that);
setSubtitleSize(); setSubtitleSize();
@ -101,7 +101,7 @@ Ox.VideoEditorPlayer = function(options, self) {
}) })
) )
.hide() .hide()
.appendTo(that.$element); .appendTo(that);
self.$markerPoint = {}; self.$markerPoint = {};
['in', 'out'].forEach(function(point, i) { ['in', 'out'].forEach(function(point, i) {
@ -114,7 +114,7 @@ Ox.VideoEditorPlayer = function(options, self) {
src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png' src: Ox.UI.PATH + 'png/videoMarker' + titleCase + '.png'
}) })
.hide() .hide()
.appendTo(that.$element); .appendTo(that);
if (self.options.points[i] == self.options.position) { if (self.options.points[i] == self.options.position) {
self.$markerPoint[point][edge].show(); 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' autoplay: 'autoplay'
} : {})) } : {}))
.hide() .hide()
.appendTo(that.$element); .appendTo(that);
}); });
item.videos = item.$videos.map(function($video) { item.videos = item.$videos.map(function($video) {
return $video[0]; return $video[0];
@ -168,7 +168,7 @@ Ox.VideoElement = function(options, self) {
background: 'rgb(0, 0, 0)', background: 'rgb(0, 0, 0)',
opacity: 0 opacity: 0
}) })
.appendTo(that.$element); .appendTo(that);
return item; return item;
} }

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

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

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

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

2
source/Ox.UI/js/Window/Dialog.js
View file

@ -576,7 +576,7 @@ Ox.Dialog = function(options, self) {
borderBottomLeftRadius: '8px', borderBottomLeftRadius: '8px',
borderBottomRightRadius: '8px' borderBottomRightRadius: '8px'
}) })
.appendTo(that.$element); .appendTo(that);
!isImage && self.$content.append( !isImage && self.$content.append(
self.options.content.css(self.hasButtons ? {} : { self.options.content.css(self.hasButtons ? {} : {
borderBottomLeftRadius: '8px', borderBottomLeftRadius: '8px',