trailing comma removal,
This commit is contained in:
parent
61e05f4f86
commit
68d50978ba
44 changed files with 87 additions and 87 deletions
|
@ -12,7 +12,7 @@ Ox.load.UI = function(options, callback) {
|
|||
var browsers = [
|
||||
{
|
||||
name: 'Chrome Frame',
|
||||
url: 'http://www.google.com/chromeframe/',
|
||||
url: 'http://www.google.com/chromeframe/'
|
||||
},
|
||||
{
|
||||
name: 'Chrome',
|
||||
|
@ -178,7 +178,7 @@ Ox.load.UI = function(options, callback) {
|
|||
position: 'absolute',
|
||||
left: (i * 72) + 'px',
|
||||
width: '72px',
|
||||
height: '72px',
|
||||
height: '72px'
|
||||
})
|
||||
.appendTo(box);
|
||||
Ox.$('<img>')
|
||||
|
|
|
@ -513,7 +513,7 @@ Ox.Calendar = function(options, self) {
|
|||
.appendTo(that),
|
||||
deselectButton: Ox.Button({
|
||||
title: 'close',
|
||||
type: 'image',
|
||||
type: 'image'
|
||||
})
|
||||
.addClass('OxEventControl OxEventDeselectButton')
|
||||
.css({bottom: 20 + (self.options.showZoombar * 16) + 'px'})
|
||||
|
|
|
@ -153,7 +153,7 @@ Ox.ListCalendar = function(options, self) {
|
|||
operator: '-',
|
||||
title: 'Date Created',
|
||||
visible: false,
|
||||
width: 128,
|
||||
width: 128
|
||||
},
|
||||
{
|
||||
format: function(value) {
|
||||
|
@ -163,7 +163,7 @@ Ox.ListCalendar = function(options, self) {
|
|||
operator: '-',
|
||||
title: 'Date Modified',
|
||||
visible: false,
|
||||
width: 128,
|
||||
width: 128
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -173,7 +173,7 @@ Ox.ListCalendar = function(options, self) {
|
|||
operator: '-',
|
||||
title: 'Matches',
|
||||
visible: true,
|
||||
width: 64,
|
||||
width: 64
|
||||
});
|
||||
|
||||
self.$listToolbar = Ox.Bar({
|
||||
|
@ -505,7 +505,7 @@ Ox.ListCalendar = function(options, self) {
|
|||
size: 256
|
||||
},
|
||||
{
|
||||
element: self.$calendar,
|
||||
element: self.$calendar
|
||||
},
|
||||
{
|
||||
collapsible: self.options.collapsible,
|
||||
|
|
|
@ -103,7 +103,7 @@ Ox.DocPage = function(options, self) {
|
|||
paddingTop: (level ? 0 : 8) + 'px',
|
||||
borderTopWidth: level ? 0 : '1px',
|
||||
marginTop: (level ? 0 : 8) + 'px',
|
||||
marginLeft: (level * 32) + 'px',
|
||||
marginLeft: (level * 32) + 'px'
|
||||
})
|
||||
.html(Ox.parseHTML(item.description))
|
||||
);
|
||||
|
@ -113,7 +113,7 @@ Ox.DocPage = function(options, self) {
|
|||
paddingTop: (level ? 0 : 8) + 'px',
|
||||
borderTopWidth: level ? 0 : '1px',
|
||||
marginTop: (level ? 0 : 8) + 'px',
|
||||
marginLeft: (level * 32) + 'px',
|
||||
marginLeft: (level * 32) + 'px'
|
||||
})
|
||||
.append(
|
||||
$('<img>')
|
||||
|
@ -195,7 +195,7 @@ Ox.DocPage = function(options, self) {
|
|||
.addClass(className)
|
||||
.css({
|
||||
borderWidth: '1px',
|
||||
marginTop: '8px',
|
||||
marginTop: '8px'
|
||||
})
|
||||
);
|
||||
} else {
|
||||
|
|
|
@ -191,7 +191,7 @@ Ox.ExamplePage = function(options, self) {
|
|||
self.options.width = that.width();
|
||||
self.options.height = that.height();
|
||||
self.$content.css({
|
||||
width: self.options.width * 2 + 'px',
|
||||
width: self.options.width * 2 + 'px'
|
||||
})
|
||||
self.$viewer.css({
|
||||
width: self.options.width + 'px',
|
||||
|
|
|
@ -14,7 +14,7 @@ Ox.SourceViewer = function(options, self) {
|
|||
.defaults({
|
||||
file: '',
|
||||
replaceCode: [],
|
||||
replaceComment: [],
|
||||
replaceComment: []
|
||||
})
|
||||
.options(options)
|
||||
.addClass('OxSourceViewer');
|
||||
|
|
|
@ -33,7 +33,7 @@ Ox.SyntaxHighlighter = function(options, self) {
|
|||
showWhitespace: false,
|
||||
source: '',
|
||||
stripComments: false,
|
||||
tabSize: 4,
|
||||
tabSize: 4
|
||||
})
|
||||
.options(options || {})
|
||||
.addClass('OxSyntaxHighlighter');
|
||||
|
|
|
@ -168,7 +168,7 @@ Ox.ArrayInput = function(options, self) {
|
|||
self.$element.forEach(function($element, i) {
|
||||
$element.data({index: i});
|
||||
self.$removeButton[i].options({
|
||||
title: self.$element.length == 1 ? 'close' : 'remove',
|
||||
title: self.$element.length == 1 ? 'close' : 'remove'
|
||||
});
|
||||
self.$addButton[i].options({
|
||||
disabled: self.$element.length == self.options.max
|
||||
|
|
|
@ -50,7 +50,7 @@ Ox.DateInput = function(options, self) {
|
|||
id: 'weekday',
|
||||
width: self.options.width.weekday
|
||||
})
|
||||
.bindEvent('autocomplete', changeWeekday),
|
||||
.bindEvent('autocomplete', changeWeekday)
|
||||
} : {}, {
|
||||
day: Ox.Input({
|
||||
autocomplete: Ox.range(1, Ox.getDaysInMonth(
|
||||
|
|
|
@ -112,7 +112,7 @@ Ox.Editable = function(options, self) {
|
|||
element: self.options.type == 'input' ? '<span>' : '<div>',
|
||||
style: 'square',
|
||||
type: self.options.type,
|
||||
value: formatInputValue(),
|
||||
value: formatInputValue()
|
||||
})
|
||||
.css(self.css)
|
||||
.bindEvent({
|
||||
|
|
|
@ -129,7 +129,7 @@ Ox.FileInput = function(options, self) {
|
|||
left: 0,
|
||||
top: 0,
|
||||
width: self.options.width - 2 + 'px',
|
||||
height: '64px',
|
||||
height: '64px'
|
||||
})
|
||||
.bindEvent({
|
||||
'delete': function(data) {
|
||||
|
|
|
@ -164,13 +164,13 @@ Ox.Filter = function(options, self) {
|
|||
width: 208
|
||||
})
|
||||
],
|
||||
float: 'left',
|
||||
float: 'left'
|
||||
});
|
||||
|
||||
self.$save = Ox.InputGroup({
|
||||
inputs: [
|
||||
self.$foo = Ox.Checkbox({
|
||||
width: 16,
|
||||
width: 16
|
||||
}),
|
||||
Ox.Input({
|
||||
id: 'list',
|
||||
|
|
|
@ -15,7 +15,7 @@ Ox.FormItem = function(options, self) {
|
|||
var that = Ox.Element({}, self)
|
||||
.defaults({
|
||||
element: null,
|
||||
error: '',
|
||||
error: ''
|
||||
})
|
||||
.options(options || {})
|
||||
.addClass('OxFormItem');
|
||||
|
|
|
@ -154,7 +154,7 @@ Ox.Input = function(options, self) {
|
|||
width: self.options.labelWidth
|
||||
})
|
||||
.css({
|
||||
float: 'left', // fixme: use css rule
|
||||
float: 'left' // fixme: use css rule
|
||||
})
|
||||
.click(function() {
|
||||
// fixme: ???
|
||||
|
@ -224,7 +224,7 @@ Ox.Input = function(options, self) {
|
|||
width: self.inputWidth + 'px',
|
||||
textAlign: self.options.textAlign
|
||||
}, self.options.type == 'textarea' ? {
|
||||
height: self.options.height - 6 + 'px',
|
||||
height: self.options.height - 6 + 'px'
|
||||
} : {})
|
||||
)
|
||||
.val(self.options.value)
|
||||
|
@ -404,7 +404,7 @@ Ox.Input = function(options, self) {
|
|||
});
|
||||
if (!self.selectEventBound) {
|
||||
self.$autocompleteMenu.bindEvent({
|
||||
select: selectMenu,
|
||||
select: selectMenu
|
||||
});
|
||||
self.selectEventBound = true;
|
||||
}
|
||||
|
@ -440,7 +440,7 @@ Ox.Input = function(options, self) {
|
|||
})
|
||||
.addClass('OxAutocompleteMenu')
|
||||
.bindEvent({
|
||||
click: clickMenu,
|
||||
click: clickMenu
|
||||
});
|
||||
return menu;
|
||||
}
|
||||
|
|
|
@ -155,7 +155,7 @@ Ox.ObjectArrayInput = function(options, self) {
|
|||
[i == length - 1 ? 'addClass' : 'removeClass']('OxLast')
|
||||
.data({index: i});
|
||||
self.$removeButton[i].options({
|
||||
disabled: length == 1,
|
||||
disabled: length == 1
|
||||
});
|
||||
self.$addButton[i].options({
|
||||
disabled: length == self.options.max
|
||||
|
|
|
@ -47,7 +47,7 @@ Ox.Range = function(options, self) {
|
|||
trackImages: [],
|
||||
trackStep: 0,
|
||||
value: 0,
|
||||
values: [],
|
||||
values: []
|
||||
})
|
||||
.options(options || {})
|
||||
.addClass('OxRange')
|
||||
|
@ -233,8 +233,8 @@ Ox.Range = function(options, self) {
|
|||
|
||||
function setThumb(animate) {
|
||||
self.$thumb.stop().animate({
|
||||
marginLeft: getPx(self.options.value) - 1 + 'px',
|
||||
//width: self.thumbSize + 'px'
|
||||
marginLeft: getPx(self.options.value) - 1 + 'px'
|
||||
//, width: self.thumbSize + 'px'
|
||||
}, animate ? 250 : 0, function() {
|
||||
self.options.thumbValue && self.$thumb.options({
|
||||
title: self.options.value
|
||||
|
|
|
@ -133,7 +133,7 @@ Ox.Chart = function(options, self) {
|
|||
format: self.options.formatKey,
|
||||
id: 'key',
|
||||
width: self.options.keyWidth,
|
||||
visible: true,
|
||||
visible: true
|
||||
},
|
||||
{
|
||||
format: renderValue,
|
||||
|
|
|
@ -47,7 +47,7 @@ Ox.IconItem = function(options, self) {
|
|||
infoIsObject: Ox.isObject(self.options.info),
|
||||
lineLength: self.options.itemWidth == 64 ? 15 : 23,
|
||||
lines: self.options.itemWidth == 64 ? 4 : 5,
|
||||
url: Ox.UI.PATH + 'png/transparent.png',
|
||||
url: Ox.UI.PATH + 'png/transparent.png'
|
||||
});
|
||||
|
||||
self.title = formatText(self.options.title, self.lines - 1 - self.infoIsObject, self.lineLength);
|
||||
|
|
|
@ -112,7 +112,7 @@ Ox.IconList = function(options, self) {
|
|||
imageHeight: data.height,
|
||||
imageWidth: data.width,
|
||||
itemHeight: self.itemHeight,
|
||||
itemWidth: self.itemWidth,
|
||||
itemWidth: self.itemWidth
|
||||
//height: Math.round(self.options.size / (ratio <= 1 ? 1 : ratio)),
|
||||
//size: self.options.size,
|
||||
//width: Math.round(self.options.size * (ratio >= 1 ? 1 : ratio))
|
||||
|
|
|
@ -80,7 +80,7 @@ Ox.InfoList = function(options, self) {
|
|||
float: 'left',
|
||||
width: '132px',
|
||||
height: '192px',
|
||||
margin: '4px 2px 4px 2px',
|
||||
margin: '4px 2px 4px 2px'
|
||||
//background: 'blue'
|
||||
})
|
||||
.append(
|
||||
|
@ -102,7 +102,7 @@ Ox.InfoList = function(options, self) {
|
|||
.css({
|
||||
float: 'left',
|
||||
width: getItemWidth() - 144 + 'px',
|
||||
height: 196 + 'px',
|
||||
height: 196 + 'px'
|
||||
//background: 'green'
|
||||
}),
|
||||
$infobox = Ox.Element()
|
||||
|
@ -118,8 +118,8 @@ Ox.InfoList = function(options, self) {
|
|||
.css({
|
||||
width: getItemWidth() - 8 + 'px',
|
||||
height: 196 + 'px',
|
||||
margin: '4px',
|
||||
//background: 'red'
|
||||
margin: '4px'
|
||||
//, background: 'red'
|
||||
})
|
||||
.append($icon)
|
||||
.append($info);
|
||||
|
|
|
@ -458,7 +458,7 @@ Ox.List = function(options, self) {
|
|||
if (self.listLength < visibleItems) {
|
||||
Ox.range(self.listLength, visibleItems).forEach(function(i) {
|
||||
var $item = Ox.ListItem({
|
||||
construct: self.options.construct,
|
||||
construct: self.options.construct
|
||||
});
|
||||
$item.addClass('OxEmpty').removeClass('OxTarget');
|
||||
if (i == visibleItems - 1) {
|
||||
|
@ -894,7 +894,7 @@ Ox.List = function(options, self) {
|
|||
self.$items[self.drag.pos]
|
||||
.addClass('OxDrag')
|
||||
.css({
|
||||
cursor: 'move',
|
||||
cursor: 'move'
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -917,7 +917,7 @@ Ox.List = function(options, self) {
|
|||
var $item = self.$items[self.drag.pos];
|
||||
$item.removeClass('OxDrag')
|
||||
.css({
|
||||
cursor: 'default',
|
||||
cursor: 'default'
|
||||
});
|
||||
that.triggerEvent('move', {
|
||||
//id: id,
|
||||
|
|
|
@ -872,7 +872,7 @@ Ox.TextList = function(options, self) {
|
|||
mousedown: function(e) {
|
||||
// keep mousedown from reaching list
|
||||
e.stopPropagation();
|
||||
},
|
||||
}
|
||||
})
|
||||
.bindEvent({
|
||||
blur: submit,
|
||||
|
|
|
@ -80,7 +80,7 @@ Ox.TreeList = function(options, self) {
|
|||
$('<div>')
|
||||
.addClass('OxCell OxTarget')
|
||||
.css({
|
||||
width: padding + 'px',
|
||||
width: padding + 'px'
|
||||
})
|
||||
.appendTo($item);
|
||||
}
|
||||
|
@ -88,7 +88,7 @@ Ox.TreeList = function(options, self) {
|
|||
$('<div>')
|
||||
.addClass('OxCell')
|
||||
.css({
|
||||
width: '8px',
|
||||
width: '8px'
|
||||
})
|
||||
.append(
|
||||
// fixme: need Ox.Icon()
|
||||
|
|
|
@ -255,7 +255,7 @@ Ox.ListMap = function(options, self) {
|
|||
operator: '-',
|
||||
title: 'Date Created',
|
||||
visible: false,
|
||||
width: 128,
|
||||
width: 128
|
||||
},
|
||||
{
|
||||
format: function(value) {
|
||||
|
@ -265,7 +265,7 @@ Ox.ListMap = function(options, self) {
|
|||
operator: '-',
|
||||
title: 'Date Modified',
|
||||
visible: false,
|
||||
width: 128,
|
||||
width: 128
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -728,7 +728,7 @@ Ox.ListMap = function(options, self) {
|
|||
resize: function() {
|
||||
self.$map.resizeMap();
|
||||
}
|
||||
}),
|
||||
})
|
||||
},
|
||||
{
|
||||
collapsible: self.options.collapsible,
|
||||
|
|
|
@ -460,7 +460,7 @@ Ox.Map = function(options, self) {
|
|||
deselectButton: Ox.Button({
|
||||
title: 'close',
|
||||
tooltip: 'Deselect',
|
||||
type: 'image',
|
||||
type: 'image'
|
||||
})
|
||||
.addClass('OxPlaceControl OxPlaceDeselectButton')
|
||||
.bindEvent({
|
||||
|
@ -915,7 +915,7 @@ Ox.Map = function(options, self) {
|
|||
['moz', 'o', 'webkit'].forEach(function(browser) {
|
||||
$element.css({
|
||||
backgroundImage: '-' + browser
|
||||
+ '-linear-gradient(left, rgba(255, 255, 255, 0) 0px, rgba(255, 255, 255, 0.1) 50px)',
|
||||
+ '-linear-gradient(left, rgba(255, 255, 255, 0) 0px, rgba(255, 255, 255, 0.1) 50px)'
|
||||
});
|
||||
});
|
||||
$element.children().css({color: 'rgb(192, 192, 192)'});
|
||||
|
|
|
@ -42,7 +42,7 @@ Ox.MapMarker = function(options) {
|
|||
});
|
||||
that.marker = new google.maps.Marker({
|
||||
raiseOnDrag: false,
|
||||
shape: {coords: [8, 8, 8], type: 'circle'},
|
||||
shape: {coords: [8, 8, 8], type: 'circle'}
|
||||
//title: that.place.name,
|
||||
//zIndex: 1000
|
||||
});
|
||||
|
|
|
@ -21,7 +21,7 @@ Ox.MapMarkerImage = (function() {
|
|||
mode: 'normal', // normal, selected, editing
|
||||
rectangle: false,
|
||||
size: 16,
|
||||
type: 'place', // place, result
|
||||
type: 'place' // place, result
|
||||
}, options);
|
||||
|
||||
var index = [
|
||||
|
|
|
@ -58,7 +58,7 @@ Ox.MapPlace = function(options) {
|
|||
se: new google.maps.LatLng(that.south, that.east),
|
||||
n: new google.maps.LatLng(that.north, that.lng),
|
||||
nw: new google.maps.LatLng(that.north, that.west),
|
||||
w: new google.maps.LatLng(that.lat, that.west),
|
||||
w: new google.maps.LatLng(that.lat, that.west)
|
||||
});
|
||||
// fixme: use bounds.toSpan()
|
||||
that.sizeNorthSouth = (that.north - that.south)
|
||||
|
|
|
@ -26,7 +26,7 @@ Ox.MapRectangle = function(options, self) {
|
|||
@*/
|
||||
that.rectangle = new google.maps.Rectangle({
|
||||
clickable: true,
|
||||
bounds: that.place.bounds,
|
||||
bounds: that.place.bounds
|
||||
});
|
||||
/*@
|
||||
markers <a> array of markers
|
||||
|
|
|
@ -113,7 +113,7 @@ Ox.MapRectangleMarker = function(options, self) {
|
|||
rectangle: true,
|
||||
type: that.place.id[0] == '_' ? 'result' : 'place'
|
||||
}),
|
||||
position: that.place.points[that.position],
|
||||
position: that.place.points[that.position]
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
@ -324,7 +324,7 @@ Ox.Menu = function(options, self) {
|
|||
},
|
||||
parent: that,
|
||||
side: 'right',
|
||||
size: self.options.size,
|
||||
size: self.options.size
|
||||
});
|
||||
}
|
||||
} else {
|
||||
|
@ -774,7 +774,7 @@ Ox.Menu = function(options, self) {
|
|||
that.parent().length == 0 && that.appendTo(Ox.UI.$body);
|
||||
that.css({
|
||||
left: '-1000px',
|
||||
top: '-1000px',
|
||||
top: '-1000px'
|
||||
}).show();
|
||||
var offset = self.options.element.offset(),
|
||||
width = self.options.element.outerWidth(),
|
||||
|
|
|
@ -66,7 +66,7 @@ Ox.MenuButton = function(options, self) {
|
|||
id: self.options.id + 'Menu',
|
||||
items: self.options.items,
|
||||
maxWidth: self.options.maxWidth,
|
||||
side: 'bottom', // FIXME: should be edge
|
||||
side: 'bottom' // FIXME: should be edge
|
||||
})
|
||||
.bindEvent({
|
||||
change: changeMenu,
|
||||
|
|
|
@ -27,7 +27,7 @@ Ox.CollapsePanel = function(options, self) {
|
|||
|
||||
self.$titlebar = Ox.Bar({
|
||||
orientation: 'horizontal',
|
||||
size: self.options.size,
|
||||
size: self.options.size
|
||||
})
|
||||
.bindEvent({
|
||||
doubleclick: doubleclickTitlebar
|
||||
|
|
|
@ -139,7 +139,7 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
that.triggerEvent('toggle' + (
|
||||
layer.type == 'event' ? 'calendar' : 'map'
|
||||
), data);
|
||||
},
|
||||
}
|
||||
})
|
||||
.appendTo(self.$folders);
|
||||
[
|
||||
|
|
|
@ -27,7 +27,7 @@ Ox.BlockVideoTimeline = function(options, self) {
|
|||
.options(options || {})
|
||||
.addClass('OxBlockVideoTimeline')
|
||||
.css({
|
||||
position: 'absolute',
|
||||
position: 'absolute'
|
||||
})
|
||||
.bind({
|
||||
mousedown: mousedown,
|
||||
|
@ -120,7 +120,7 @@ Ox.BlockVideoTimeline = function(options, self) {
|
|||
top: '2px',
|
||||
width: Math.round(self.options.duration) + 'px',
|
||||
height: '20px',
|
||||
marginLeft: -i * self.options.width + 'px',
|
||||
marginLeft: -i * self.options.width + 'px'
|
||||
//background: 'rgba(255, 0, 0, 0.1)',
|
||||
})
|
||||
.appendTo(self.$lines[i]);
|
||||
|
|
|
@ -133,7 +133,7 @@ Ox.LargeVideoTimeline = function(options, self) {
|
|||
|
||||
function setMarker() {
|
||||
self.$markerPosition.css({
|
||||
left: self.center + 'px',
|
||||
left: self.center + 'px'
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ Ox.SmallVideoTimeline = function(options, self) {
|
|||
left: self.interfaceLeft + 'px',
|
||||
top: self.interfaceTop + 'px',
|
||||
width: self.interfaceWidth + 'px',
|
||||
height: '20px',
|
||||
height: '20px'
|
||||
})
|
||||
.bindEvent({
|
||||
drag: function(data) {
|
||||
|
|
|
@ -20,7 +20,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
|
|||
state: 'default',
|
||||
subtitles: [],
|
||||
type: '',
|
||||
width: 256,
|
||||
width: 256
|
||||
})
|
||||
.options(options || {})
|
||||
.css({
|
||||
|
|
|
@ -361,7 +361,7 @@ Ox.VideoEditor = function(options, self) {
|
|||
})
|
||||
.css({
|
||||
left: self.sizes.timeline[1].left + 'px',
|
||||
top: self.sizes.timeline[1].top + 'px',
|
||||
top: self.sizes.timeline[1].top + 'px'
|
||||
})
|
||||
.bindEvent({
|
||||
edit: function() {
|
||||
|
@ -509,12 +509,12 @@ Ox.VideoEditor = function(options, self) {
|
|||
} else if (id == 'downloadSelection') {
|
||||
that.triggerEvent('downloadselection', {
|
||||
'in': self.options['in'],
|
||||
out: self.options.out,
|
||||
out: self.options.out
|
||||
});
|
||||
} else if (id == 'embedSelection') {
|
||||
that.triggerEvent('embedselection', {
|
||||
'in': self.options['in'],
|
||||
out: self.options.out,
|
||||
out: self.options.out
|
||||
});
|
||||
} else if (id == 'importAnnotations') {
|
||||
that.triggerEvent('importannotations');
|
||||
|
@ -727,7 +727,7 @@ Ox.VideoEditor = function(options, self) {
|
|||
togglemap: function(data) {
|
||||
self.options.showAnnotationsMap = !data.collapsed;
|
||||
that.triggerEvent('togglemap', data);
|
||||
},
|
||||
}
|
||||
});
|
||||
|
||||
[
|
||||
|
@ -971,7 +971,7 @@ Ox.VideoEditor = function(options, self) {
|
|||
size.player[0] = {
|
||||
left: self.margin / 2,
|
||||
top: self.margin / 2,
|
||||
width: Math.round((contentWidth - 3 * self.margin + (self.controlsHeight + self.margin) / 2 * self.options.videoRatio) * 2/3),
|
||||
width: Math.round((contentWidth - 3 * self.margin + (self.controlsHeight + self.margin) / 2 * self.options.videoRatio) * 2/3)
|
||||
};
|
||||
size.player[0].height = Math.round(size.player[0].width / self.options.videoRatio);
|
||||
size.player[1] = {
|
||||
|
|
|
@ -185,7 +185,7 @@ Ox.VideoEditorPlayer = function(options, self) {
|
|||
value: Ox.formatDuration(self.options.position, 3)
|
||||
})
|
||||
.css({
|
||||
float: 'right',
|
||||
float: 'right'
|
||||
})
|
||||
.appendTo(self.$controls)
|
||||
|
||||
|
|
|
@ -292,7 +292,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
self.$videoContainer = Ox.Element()
|
||||
.addClass('OxVideoContainer')
|
||||
.css({
|
||||
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0,
|
||||
top: self.options.externalControls && self.options.controlsTop.length ? '16px' : 0
|
||||
})
|
||||
.appendTo(that.$element)
|
||||
|
||||
|
@ -315,7 +315,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
// and poster doesn't seem to work at all
|
||||
Ox.extend({
|
||||
preload: self.options.preload,
|
||||
src: self.video,
|
||||
src: self.video
|
||||
}, !self.options.paused && !self.options.playInToOut ? {
|
||||
/*autoplay: 'autoplay'*/
|
||||
} : {}/*, self.options.poster ? {
|
||||
|
@ -443,7 +443,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
})
|
||||
.addClass('OxCensoredIcon OxVideo')
|
||||
.attr({
|
||||
src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern'),
|
||||
src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern')
|
||||
})
|
||||
.hide()
|
||||
.bindEvent({
|
||||
|
@ -668,7 +668,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
})
|
||||
.addClass('OxPosition')
|
||||
.css({
|
||||
width: self.positionWidth - 4 + 'px',
|
||||
width: self.positionWidth - 4 + 'px'
|
||||
})
|
||||
.html(formatPosition())
|
||||
.bind({
|
||||
|
@ -1256,7 +1256,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
css = {
|
||||
left: logoMargin + 'px',
|
||||
top: logoMargin + (self.controlsTopAreVisible ? 16 : 0) + 'px',
|
||||
height: logoHeight + 'px',
|
||||
height: logoHeight + 'px'
|
||||
};
|
||||
} else if (element == 'player') {
|
||||
var height = self.options.fullscreen ? window.innerHeight : self.height;
|
||||
|
@ -1590,7 +1590,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
self.$logo.unbind('mouseenter').unbind('mouseleave');
|
||||
});
|
||||
self.$subtitle && self.$subtitle.animate({
|
||||
bottom: getCSS('subtitle').bottom,
|
||||
bottom: getCSS('subtitle').bottom
|
||||
}, 250);
|
||||
}
|
||||
}, self.options.fullscreen ? 2500 : 1000);
|
||||
|
@ -2007,7 +2007,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
width: width
|
||||
});
|
||||
self.$findInput.children('input').css({
|
||||
width: (width - 12) + 'px',
|
||||
width: (width - 12) + 'px'
|
||||
});
|
||||
});
|
||||
setSize(self.$volume, getCSS('volume'), animate, function() {
|
||||
|
@ -2110,7 +2110,7 @@ Ox.VideoPlayer = function(options, self) {
|
|||
});
|
||||
});
|
||||
self.$subtitle && self.$subtitle.animate({
|
||||
bottom: getCSS('subtitle').bottom,
|
||||
bottom: getCSS('subtitle').bottom
|
||||
}, 250);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -203,7 +203,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
self.$position = Ox.Element()
|
||||
.addClass('OxPosition')
|
||||
.css({
|
||||
width: self.positionWidth - 4 + 'px',
|
||||
width: self.positionWidth - 4 + 'px'
|
||||
})
|
||||
.html(formatPosition())
|
||||
.bind({
|
||||
|
@ -309,7 +309,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
left: 0,
|
||||
top: 0,
|
||||
width: self.videoWidth + 'px',
|
||||
height: self.tileHeight + 'px',
|
||||
height: self.tileHeight + 'px'
|
||||
})
|
||||
.appendTo(self.$frameBox);
|
||||
|
||||
|
@ -361,7 +361,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
left: 0,
|
||||
top: 0,
|
||||
width: self.videoWidth + 'px',
|
||||
height: self.tileHeight + 'px',
|
||||
height: self.tileHeight + 'px'
|
||||
})
|
||||
.appendTo(self.$videoBox);
|
||||
|
||||
|
@ -391,11 +391,11 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
self.$timeline.clone()
|
||||
.css({
|
||||
width: self.frame + self.videoWidth + 'px',
|
||||
marginLeft: -i * self.contentWidth + 'px',
|
||||
marginLeft: -i * self.contentWidth + 'px'
|
||||
}),
|
||||
self.$timeline.clone()
|
||||
.css({
|
||||
marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px',
|
||||
marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px'
|
||||
})
|
||||
];
|
||||
self.$lines[i]
|
||||
|
@ -591,7 +591,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
|
|||
left: 0,
|
||||
top: self.margin / 2 + 'px',
|
||||
width: self.frames + 'px',
|
||||
height: self.tileHeight + 'px',
|
||||
height: self.tileHeight + 'px'
|
||||
//background: 'rgba(255, 0, 0, 0.5)'
|
||||
})
|
||||
.appendTo($timeline);
|
||||
|
|
|
@ -138,7 +138,7 @@ Ox.Dialog = function(options, self) {
|
|||
},
|
||||
dragstart: dragstart,
|
||||
drag: drag,
|
||||
dragend: dragend,
|
||||
dragend: dragend
|
||||
});
|
||||
self.hasButtons && self.$buttonsbar.css({
|
||||
cursor: 'move'
|
||||
|
@ -362,7 +362,7 @@ Ox.Dialog = function(options, self) {
|
|||
left: self.drag.left + (
|
||||
self.drag.width - self.options.width
|
||||
) / (self.drag.fixedCenter ? 2 : 1),
|
||||
width: self.options.width,
|
||||
width: self.options.width
|
||||
}, self.drag.fixedRatio ? {
|
||||
top: Math.max(Math.round(
|
||||
self.drag.edge == 'topleft'
|
||||
|
@ -394,7 +394,7 @@ Ox.Dialog = function(options, self) {
|
|||
top: Math.max(self.drag.top + (
|
||||
self.drag.height - self.options.height
|
||||
) / (self.drag.fixedCenter ? 2 : 1), self.minTop),
|
||||
height: self.options.height,
|
||||
height: self.options.height
|
||||
}, (self.drag.fixedRatio) ? {
|
||||
left: Math.round(
|
||||
self.drag.edge == 'topleft'
|
||||
|
@ -423,7 +423,7 @@ Ox.Dialog = function(options, self) {
|
|||
self.options.width = Math.round(self.options.height * ratio);
|
||||
}
|
||||
setCSS(Ox.extend({
|
||||
width: self.options.width,
|
||||
width: self.options.width
|
||||
}, self.drag.fixedCenter ? {
|
||||
left: self.drag.left + (
|
||||
self.drag.width - self.options.width
|
||||
|
@ -456,7 +456,7 @@ Ox.Dialog = function(options, self) {
|
|||
self.options.height = Math.round(self.options.width / ratio);
|
||||
}
|
||||
setCSS(Ox.extend({
|
||||
height: self.options.height,
|
||||
height: self.options.height
|
||||
}, self.drag.fixedCenter ? {
|
||||
top: Math.max(self.drag.top + (
|
||||
self.drag.height - self.options.height
|
||||
|
|
|
@ -18,7 +18,7 @@ Ox.Layer = function(options, self) {
|
|||
.options(options || {})
|
||||
.addClass('OxLayer Ox' + Ox.toTitleCase(self.options.type) + 'Layer')
|
||||
.bind(self.options.type == 'dialog' ? {
|
||||
mousedown: mousedown,
|
||||
mousedown: mousedown
|
||||
} : {
|
||||
click: click
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue