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

trailing comma removal,

Browse source
This commit is contained in:
j 2012-05-26 15:48:19 +00:00
parent 61e05f4f86
commit 68d50978ba
44 changed files with 87 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,7 @@ Ox.load.UI = function(options, callback) {
var browsers = [ var browsers = [
{ {
name: 'Chrome Frame', name: 'Chrome Frame',
url: 'http://www.google.com/chromeframe/', url: 'http://www.google.com/chromeframe/'
}, },
{ {
name: 'Chrome', name: 'Chrome',
@ -178,7 +178,7 @@ Ox.load.UI = function(options, callback) {
position: 'absolute', position: 'absolute',
left: (i * 72) + 'px', left: (i * 72) + 'px',
width: '72px', width: '72px',
height: '72px', height: '72px'
}) })
.appendTo(box); .appendTo(box);
Ox.$('<img>') Ox.$('<img>')

2
source/Ox.UI/js/Calendar/Ox.Calendar.js
View file

@ -513,7 +513,7 @@ Ox.Calendar = function(options, self) {
.appendTo(that), .appendTo(that),
deselectButton: Ox.Button({ deselectButton: Ox.Button({
title: 'close', title: 'close',
type: 'image', type: 'image'
}) })
.addClass('OxEventControl OxEventDeselectButton') .addClass('OxEventControl OxEventDeselectButton')
.css({bottom: 20 + (self.options.showZoombar * 16) + 'px'}) .css({bottom: 20 + (self.options.showZoombar * 16) + 'px'})

8
source/Ox.UI/js/Calendar/Ox.ListCalendar.js
View file

@ -153,7 +153,7 @@ Ox.ListCalendar = function(options, self) {
operator: '-', operator: '-',
title: 'Date Created', title: 'Date Created',
visible: false, visible: false,
width: 128, width: 128
}, },
{ {
format: function(value) { format: function(value) {
@ -163,7 +163,7 @@ Ox.ListCalendar = function(options, self) {
operator: '-', operator: '-',
title: 'Date Modified', title: 'Date Modified',
visible: false, visible: false,
width: 128, width: 128
} }
]; ];
@ -173,7 +173,7 @@ Ox.ListCalendar = function(options, self) {
operator: '-', operator: '-',
title: 'Matches', title: 'Matches',
visible: true, visible: true,
width: 64, width: 64
}); });
self.$listToolbar = Ox.Bar({ self.$listToolbar = Ox.Bar({
@ -505,7 +505,7 @@ Ox.ListCalendar = function(options, self) {
size: 256 size: 256
}, },
{ {
element: self.$calendar, element: self.$calendar
}, },
{ {
collapsible: self.options.collapsible, collapsible: self.options.collapsible,

6
source/Ox.UI/js/Code/Ox.DocPage.js
View file

@ -103,7 +103,7 @@ Ox.DocPage = function(options, self) {
paddingTop: (level ? 0 : 8) + 'px', paddingTop: (level ? 0 : 8) + 'px',
borderTopWidth: level ? 0 : '1px', borderTopWidth: level ? 0 : '1px',
marginTop: (level ? 0 : 8) + 'px', marginTop: (level ? 0 : 8) + 'px',
marginLeft: (level * 32) + 'px', marginLeft: (level * 32) + 'px'
}) })
.html(Ox.parseHTML(item.description)) .html(Ox.parseHTML(item.description))
); );
@ -113,7 +113,7 @@ Ox.DocPage = function(options, self) {
paddingTop: (level ? 0 : 8) + 'px', paddingTop: (level ? 0 : 8) + 'px',
borderTopWidth: level ? 0 : '1px', borderTopWidth: level ? 0 : '1px',
marginTop: (level ? 0 : 8) + 'px', marginTop: (level ? 0 : 8) + 'px',
marginLeft: (level * 32) + 'px', marginLeft: (level * 32) + 'px'
}) })
.append( .append(
$('<img>') $('<img>')
@ -195,7 +195,7 @@ Ox.DocPage = function(options, self) {
.addClass(className) .addClass(className)
.css({ .css({
borderWidth: '1px', borderWidth: '1px',
marginTop: '8px', marginTop: '8px'
}) })
); );
} else { } else {

2
source/Ox.UI/js/Code/Ox.ExamplePage.js
View file

@ -191,7 +191,7 @@ Ox.ExamplePage = function(options, self) {
self.options.width = that.width(); self.options.width = that.width();
self.options.height = that.height(); self.options.height = that.height();
self.$content.css({ self.$content.css({
width: self.options.width * 2 + 'px', width: self.options.width * 2 + 'px'
}) })
self.$viewer.css({ self.$viewer.css({
width: self.options.width + 'px', width: self.options.width + 'px',

2
source/Ox.UI/js/Code/Ox.SourceViewer.js
View file

@ -14,7 +14,7 @@ Ox.SourceViewer = function(options, self) {
.defaults({ .defaults({
file: '', file: '',
replaceCode: [], replaceCode: [],
replaceComment: [], replaceComment: []
}) })
.options(options) .options(options)
.addClass('OxSourceViewer'); .addClass('OxSourceViewer');

2
source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js
View file

@ -33,7 +33,7 @@ Ox.SyntaxHighlighter = function(options, self) {
showWhitespace: false, showWhitespace: false,
source: '', source: '',
stripComments: false, stripComments: false,
tabSize: 4, tabSize: 4
}) })
.options(options || {}) .options(options || {})
.addClass('OxSyntaxHighlighter'); .addClass('OxSyntaxHighlighter');

2
source/Ox.UI/js/Form/Ox.ArrayInput.js
View file

@ -168,7 +168,7 @@ Ox.ArrayInput = function(options, self) {
self.$element.forEach(function($element, i) { self.$element.forEach(function($element, i) {
$element.data({index: i}); $element.data({index: i});
self.$removeButton[i].options({ self.$removeButton[i].options({
title: self.$element.length == 1 ? 'close' : 'remove', title: self.$element.length == 1 ? 'close' : 'remove'
}); });
self.$addButton[i].options({ self.$addButton[i].options({
disabled: self.$element.length == self.options.max disabled: self.$element.length == self.options.max

2
source/Ox.UI/js/Form/Ox.DateInput.js
View file

@ -50,7 +50,7 @@ Ox.DateInput = function(options, self) {
id: 'weekday', id: 'weekday',
width: self.options.width.weekday width: self.options.width.weekday
}) })
.bindEvent('autocomplete', changeWeekday), .bindEvent('autocomplete', changeWeekday)
} : {}, { } : {}, {
day: Ox.Input({ day: Ox.Input({
autocomplete: Ox.range(1, Ox.getDaysInMonth( autocomplete: Ox.range(1, Ox.getDaysInMonth(

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

@ -112,7 +112,7 @@ Ox.Editable = function(options, self) {
element: self.options.type == 'input' ? '<span>' : '<div>', element: self.options.type == 'input' ? '<span>' : '<div>',
style: 'square', style: 'square',
type: self.options.type, type: self.options.type,
value: formatInputValue(), value: formatInputValue()
}) })
.css(self.css) .css(self.css)
.bindEvent({ .bindEvent({

2
source/Ox.UI/js/Form/Ox.FileInput.js
View file

@ -129,7 +129,7 @@ Ox.FileInput = function(options, self) {
left: 0, left: 0,
top: 0, top: 0,
width: self.options.width - 2 + 'px', width: self.options.width - 2 + 'px',
height: '64px', height: '64px'
}) })
.bindEvent({ .bindEvent({
'delete': function(data) { 'delete': function(data) {

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

@ -164,13 +164,13 @@ Ox.Filter = function(options, self) {
width: 208 width: 208
}) })
], ],
float: 'left', float: 'left'
}); });
self.$save = Ox.InputGroup({ self.$save = Ox.InputGroup({
inputs: [ inputs: [
self.$foo = Ox.Checkbox({ self.$foo = Ox.Checkbox({
width: 16, width: 16
}), }),
Ox.Input({ Ox.Input({
id: 'list', id: 'list',

2
source/Ox.UI/js/Form/Ox.FormItem.js
View file

@ -15,7 +15,7 @@ Ox.FormItem = function(options, self) {
var that = Ox.Element({}, self) var that = Ox.Element({}, self)
.defaults({ .defaults({
element: null, element: null,
error: '', error: ''
}) })
.options(options || {}) .options(options || {})
.addClass('OxFormItem'); .addClass('OxFormItem');

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

@ -154,7 +154,7 @@ Ox.Input = function(options, self) {
width: self.options.labelWidth width: self.options.labelWidth
}) })
.css({ .css({
float: 'left', // fixme: use css rule float: 'left' // fixme: use css rule
}) })
.click(function() { .click(function() {
// fixme: ??? // fixme: ???
@ -224,7 +224,7 @@ Ox.Input = function(options, self) {
width: self.inputWidth + 'px', width: self.inputWidth + 'px',
textAlign: self.options.textAlign textAlign: self.options.textAlign
}, self.options.type == 'textarea' ? { }, self.options.type == 'textarea' ? {
height: self.options.height - 6 + 'px', height: self.options.height - 6 + 'px'
} : {}) } : {})
) )
.val(self.options.value) .val(self.options.value)
@ -404,7 +404,7 @@ Ox.Input = function(options, self) {
}); });
if (!self.selectEventBound) { if (!self.selectEventBound) {
self.$autocompleteMenu.bindEvent({ self.$autocompleteMenu.bindEvent({
select: selectMenu, select: selectMenu
}); });
self.selectEventBound = true; self.selectEventBound = true;
} }
@ -440,7 +440,7 @@ Ox.Input = function(options, self) {
}) })
.addClass('OxAutocompleteMenu') .addClass('OxAutocompleteMenu')
.bindEvent({ .bindEvent({
click: clickMenu, click: clickMenu
}); });
return menu; return menu;
} }

2
source/Ox.UI/js/Form/Ox.ObjectArrayInput.js
View file

@ -155,7 +155,7 @@ Ox.ObjectArrayInput = function(options, self) {
[i == length - 1 ? 'addClass' : 'removeClass']('OxLast') [i == length - 1 ? 'addClass' : 'removeClass']('OxLast')
.data({index: i}); .data({index: i});
self.$removeButton[i].options({ self.$removeButton[i].options({
disabled: length == 1, disabled: length == 1
}); });
self.$addButton[i].options({ self.$addButton[i].options({
disabled: length == self.options.max disabled: length == self.options.max

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

@ -47,7 +47,7 @@ Ox.Range = function(options, self) {
trackImages: [], trackImages: [],
trackStep: 0, trackStep: 0,
value: 0, value: 0,
values: [], values: []
}) })
.options(options || {}) .options(options || {})
.addClass('OxRange') .addClass('OxRange')
@ -233,8 +233,8 @@ Ox.Range = function(options, self) {
function setThumb(animate) { function setThumb(animate) {
self.$thumb.stop().animate({ self.$thumb.stop().animate({
marginLeft: getPx(self.options.value) - 1 + 'px', marginLeft: getPx(self.options.value) - 1 + 'px'
//width: self.thumbSize + 'px' //, width: self.thumbSize + 'px'
}, animate ? 250 : 0, function() { }, animate ? 250 : 0, function() {
self.options.thumbValue && self.$thumb.options({ self.options.thumbValue && self.$thumb.options({
title: self.options.value title: self.options.value

2
source/Ox.UI/js/List/Ox.Chart.js
View file

@ -133,7 +133,7 @@ Ox.Chart = function(options, self) {
format: self.options.formatKey, format: self.options.formatKey,
id: 'key', id: 'key',
width: self.options.keyWidth, width: self.options.keyWidth,
visible: true, visible: true
}, },
{ {
format: renderValue, format: renderValue,

2
source/Ox.UI/js/List/Ox.IconItem.js
View file

@ -47,7 +47,7 @@ Ox.IconItem = function(options, self) {
infoIsObject: Ox.isObject(self.options.info), infoIsObject: Ox.isObject(self.options.info),
lineLength: self.options.itemWidth == 64 ? 15 : 23, lineLength: self.options.itemWidth == 64 ? 15 : 23,
lines: self.options.itemWidth == 64 ? 4 : 5, 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); self.title = formatText(self.options.title, self.lines - 1 - self.infoIsObject, self.lineLength);

2
source/Ox.UI/js/List/Ox.IconList.js
View file

@ -112,7 +112,7 @@ Ox.IconList = function(options, self) {
imageHeight: data.height, imageHeight: data.height,
imageWidth: data.width, imageWidth: data.width,
itemHeight: self.itemHeight, itemHeight: self.itemHeight,
itemWidth: self.itemWidth, itemWidth: self.itemWidth
//height: Math.round(self.options.size / (ratio <= 1 ? 1 : ratio)), //height: Math.round(self.options.size / (ratio <= 1 ? 1 : ratio)),
//size: self.options.size, //size: self.options.size,
//width: Math.round(self.options.size * (ratio >= 1 ? 1 : ratio)) //width: Math.round(self.options.size * (ratio >= 1 ? 1 : ratio))

8
source/Ox.UI/js/List/Ox.InfoList.js
View file

@ -80,7 +80,7 @@ Ox.InfoList = function(options, self) {
float: 'left', float: 'left',
width: '132px', width: '132px',
height: '192px', height: '192px',
margin: '4px 2px 4px 2px', margin: '4px 2px 4px 2px'
//background: 'blue' //background: 'blue'
}) })
.append( .append(
@ -102,7 +102,7 @@ Ox.InfoList = function(options, self) {
.css({ .css({
float: 'left', float: 'left',
width: getItemWidth() - 144 + 'px', width: getItemWidth() - 144 + 'px',
height: 196 + 'px', height: 196 + 'px'
//background: 'green' //background: 'green'
}), }),
$infobox = Ox.Element() $infobox = Ox.Element()
@ -118,8 +118,8 @@ Ox.InfoList = function(options, self) {
.css({ .css({
width: getItemWidth() - 8 + 'px', width: getItemWidth() - 8 + 'px',
height: 196 + 'px', height: 196 + 'px',
margin: '4px', margin: '4px'
//background: 'red' //, background: 'red'
}) })
.append($icon) .append($icon)
.append($info); .append($info);

6
source/Ox.UI/js/List/Ox.List.js
View file

@ -458,7 +458,7 @@ Ox.List = function(options, self) {
if (self.listLength < visibleItems) { if (self.listLength < visibleItems) {
Ox.range(self.listLength, visibleItems).forEach(function(i) { Ox.range(self.listLength, visibleItems).forEach(function(i) {
var $item = Ox.ListItem({ var $item = Ox.ListItem({
construct: self.options.construct, construct: self.options.construct
}); });
$item.addClass('OxEmpty').removeClass('OxTarget'); $item.addClass('OxEmpty').removeClass('OxTarget');
if (i == visibleItems - 1) { if (i == visibleItems - 1) {
@ -894,7 +894,7 @@ Ox.List = function(options, self) {
self.$items[self.drag.pos] self.$items[self.drag.pos]
.addClass('OxDrag') .addClass('OxDrag')
.css({ .css({
cursor: 'move', cursor: 'move'
}); });
} }
@ -917,7 +917,7 @@ Ox.List = function(options, self) {
var $item = self.$items[self.drag.pos]; var $item = self.$items[self.drag.pos];
$item.removeClass('OxDrag') $item.removeClass('OxDrag')
.css({ .css({
cursor: 'default', cursor: 'default'
}); });
that.triggerEvent('move', { that.triggerEvent('move', {
//id: id, //id: id,

2
source/Ox.UI/js/List/Ox.TextList.js
View file

@ -872,7 +872,7 @@ Ox.TextList = function(options, self) {
mousedown: function(e) { mousedown: function(e) {
// keep mousedown from reaching list // keep mousedown from reaching list
e.stopPropagation(); e.stopPropagation();
}, }
}) })
.bindEvent({ .bindEvent({
blur: submit, blur: submit,

4
source/Ox.UI/js/List/Ox.TreeList.js
View file

@ -80,7 +80,7 @@ Ox.TreeList = function(options, self) {
$('<div>') $('<div>')
.addClass('OxCell OxTarget') .addClass('OxCell OxTarget')
.css({ .css({
width: padding + 'px', width: padding + 'px'
}) })
.appendTo($item); .appendTo($item);
} }
@ -88,7 +88,7 @@ Ox.TreeList = function(options, self) {
$('<div>') $('<div>')
.addClass('OxCell') .addClass('OxCell')
.css({ .css({
width: '8px', width: '8px'
}) })
.append( .append(
// fixme: need Ox.Icon() // fixme: need Ox.Icon()

6
source/Ox.UI/js/Map/Ox.ListMap.js
View file

@ -255,7 +255,7 @@ Ox.ListMap = function(options, self) {
operator: '-', operator: '-',
title: 'Date Created', title: 'Date Created',
visible: false, visible: false,
width: 128, width: 128
}, },
{ {
format: function(value) { format: function(value) {
@ -265,7 +265,7 @@ Ox.ListMap = function(options, self) {
operator: '-', operator: '-',
title: 'Date Modified', title: 'Date Modified',
visible: false, visible: false,
width: 128, width: 128
} }
]; ];
@ -728,7 +728,7 @@ Ox.ListMap = function(options, self) {
resize: function() { resize: function() {
self.$map.resizeMap(); self.$map.resizeMap();
} }
}), })
}, },
{ {
collapsible: self.options.collapsible, collapsible: self.options.collapsible,

4
source/Ox.UI/js/Map/Ox.Map.js
View file

@ -460,7 +460,7 @@ Ox.Map = function(options, self) {
deselectButton: Ox.Button({ deselectButton: Ox.Button({
title: 'close', title: 'close',
tooltip: 'Deselect', tooltip: 'Deselect',
type: 'image', type: 'image'
}) })
.addClass('OxPlaceControl OxPlaceDeselectButton') .addClass('OxPlaceControl OxPlaceDeselectButton')
.bindEvent({ .bindEvent({
@ -915,7 +915,7 @@ Ox.Map = function(options, self) {
['moz', 'o', 'webkit'].forEach(function(browser) { ['moz', 'o', 'webkit'].forEach(function(browser) {
$element.css({ $element.css({
backgroundImage: '-' + browser 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)'}); $element.children().css({color: 'rgb(192, 192, 192)'});

2
source/Ox.UI/js/Map/Ox.MapMarker.js
View file

@ -42,7 +42,7 @@ Ox.MapMarker = function(options) {
}); });
that.marker = new google.maps.Marker({ that.marker = new google.maps.Marker({
raiseOnDrag: false, raiseOnDrag: false,
shape: {coords: [8, 8, 8], type: 'circle'}, shape: {coords: [8, 8, 8], type: 'circle'}
//title: that.place.name, //title: that.place.name,
//zIndex: 1000 //zIndex: 1000
}); });

2
source/Ox.UI/js/Map/Ox.MapMarkerImage.js
View file

@ -21,7 +21,7 @@ Ox.MapMarkerImage = (function() {
mode: 'normal', // normal, selected, editing mode: 'normal', // normal, selected, editing
rectangle: false, rectangle: false,
size: 16, size: 16,
type: 'place', // place, result type: 'place' // place, result
}, options); }, options);
var index = [ var index = [

2
source/Ox.UI/js/Map/Ox.MapPlace.js
View file

@ -58,7 +58,7 @@ Ox.MapPlace = function(options) {
se: new google.maps.LatLng(that.south, that.east), se: new google.maps.LatLng(that.south, that.east),
n: new google.maps.LatLng(that.north, that.lng), n: new google.maps.LatLng(that.north, that.lng),
nw: new google.maps.LatLng(that.north, that.west), 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() // fixme: use bounds.toSpan()
that.sizeNorthSouth = (that.north - that.south) that.sizeNorthSouth = (that.north - that.south)

2
source/Ox.UI/js/Map/Ox.MapRectangle.js
View file

@ -26,7 +26,7 @@ Ox.MapRectangle = function(options, self) {
@*/ @*/
that.rectangle = new google.maps.Rectangle({ that.rectangle = new google.maps.Rectangle({
clickable: true, clickable: true,
bounds: that.place.bounds, bounds: that.place.bounds
}); });
/*@ /*@
markers <a> array of markers markers <a> array of markers

2
source/Ox.UI/js/Map/Ox.MapRectangleMarker.js
View file

@ -113,7 +113,7 @@ Ox.MapRectangleMarker = function(options, self) {
rectangle: true, rectangle: true,
type: that.place.id[0] == '_' ? 'result' : 'place' type: that.place.id[0] == '_' ? 'result' : 'place'
}), }),
position: that.place.points[that.position], position: that.place.points[that.position]
}); });
}; };

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

@ -324,7 +324,7 @@ Ox.Menu = function(options, self) {
}, },
parent: that, parent: that,
side: 'right', side: 'right',
size: self.options.size, size: self.options.size
}); });
} }
} else { } else {
@ -774,7 +774,7 @@ Ox.Menu = function(options, self) {
that.parent().length == 0 && that.appendTo(Ox.UI.$body); that.parent().length == 0 && that.appendTo(Ox.UI.$body);
that.css({ that.css({
left: '-1000px', left: '-1000px',
top: '-1000px', top: '-1000px'
}).show(); }).show();
var offset = self.options.element.offset(), var offset = self.options.element.offset(),
width = self.options.element.outerWidth(), width = self.options.element.outerWidth(),

2
source/Ox.UI/js/Menu/Ox.MenuButton.js
View file

@ -66,7 +66,7 @@ Ox.MenuButton = function(options, self) {
id: self.options.id + 'Menu', id: self.options.id + 'Menu',
items: self.options.items, items: self.options.items,
maxWidth: self.options.maxWidth, maxWidth: self.options.maxWidth,
side: 'bottom', // FIXME: should be edge side: 'bottom' // FIXME: should be edge
}) })
.bindEvent({ .bindEvent({
change: changeMenu, change: changeMenu,

2
source/Ox.UI/js/Panel/Ox.CollapsePanel.js
View file

@ -27,7 +27,7 @@ Ox.CollapsePanel = function(options, self) {
self.$titlebar = Ox.Bar({ self.$titlebar = Ox.Bar({
orientation: 'horizontal', orientation: 'horizontal',
size: self.options.size, size: self.options.size
}) })
.bindEvent({ .bindEvent({
doubleclick: doubleclickTitlebar doubleclick: doubleclickTitlebar

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

@ -139,7 +139,7 @@ Ox.AnnotationPanel = function(options, self) {
that.triggerEvent('toggle' + ( that.triggerEvent('toggle' + (
layer.type == 'event' ? 'calendar' : 'map' layer.type == 'event' ? 'calendar' : 'map'
), data); ), data);
}, }
}) })
.appendTo(self.$folders); .appendTo(self.$folders);
[ [

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

@ -27,7 +27,7 @@ Ox.BlockVideoTimeline = function(options, self) {
.options(options || {}) .options(options || {})
.addClass('OxBlockVideoTimeline') .addClass('OxBlockVideoTimeline')
.css({ .css({
position: 'absolute', position: 'absolute'
}) })
.bind({ .bind({
mousedown: mousedown, mousedown: mousedown,
@ -120,7 +120,7 @@ Ox.BlockVideoTimeline = function(options, self) {
top: '2px', top: '2px',
width: Math.round(self.options.duration) + 'px', width: Math.round(self.options.duration) + 'px',
height: '20px', height: '20px',
marginLeft: -i * self.options.width + 'px', marginLeft: -i * self.options.width + 'px'
//background: 'rgba(255, 0, 0, 0.1)', //background: 'rgba(255, 0, 0, 0.1)',
}) })
.appendTo(self.$lines[i]); .appendTo(self.$lines[i]);

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

@ -133,7 +133,7 @@ Ox.LargeVideoTimeline = function(options, self) {
function setMarker() { function setMarker() {
self.$markerPosition.css({ self.$markerPosition.css({
left: self.center + 'px', left: self.center + 'px'
}); });
} }

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

@ -58,7 +58,7 @@ Ox.SmallVideoTimeline = function(options, self) {
left: self.interfaceLeft + 'px', left: self.interfaceLeft + 'px',
top: self.interfaceTop + 'px', top: self.interfaceTop + 'px',
width: self.interfaceWidth + 'px', width: self.interfaceWidth + 'px',
height: '20px', height: '20px'
}) })
.bindEvent({ .bindEvent({
drag: function(data) { drag: function(data) {

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

@ -20,7 +20,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
state: 'default', state: 'default',
subtitles: [], subtitles: [],
type: '', type: '',
width: 256, width: 256
}) })
.options(options || {}) .options(options || {})
.css({ .css({

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

@ -361,7 +361,7 @@ Ox.VideoEditor = function(options, self) {
}) })
.css({ .css({
left: self.sizes.timeline[1].left + 'px', left: self.sizes.timeline[1].left + 'px',
top: self.sizes.timeline[1].top + 'px', top: self.sizes.timeline[1].top + 'px'
}) })
.bindEvent({ .bindEvent({
edit: function() { edit: function() {
@ -509,12 +509,12 @@ Ox.VideoEditor = function(options, self) {
} else if (id == 'downloadSelection') { } else if (id == 'downloadSelection') {
that.triggerEvent('downloadselection', { that.triggerEvent('downloadselection', {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out
}); });
} else if (id == 'embedSelection') { } else if (id == 'embedSelection') {
that.triggerEvent('embedselection', { that.triggerEvent('embedselection', {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out, out: self.options.out
}); });
} else if (id == 'importAnnotations') { } else if (id == 'importAnnotations') {
that.triggerEvent('importannotations'); that.triggerEvent('importannotations');
@ -727,7 +727,7 @@ Ox.VideoEditor = function(options, self) {
togglemap: function(data) { togglemap: function(data) {
self.options.showAnnotationsMap = !data.collapsed; self.options.showAnnotationsMap = !data.collapsed;
that.triggerEvent('togglemap', data); that.triggerEvent('togglemap', data);
}, }
}); });
[ [
@ -971,7 +971,7 @@ Ox.VideoEditor = function(options, self) {
size.player[0] = { size.player[0] = {
left: self.margin / 2, left: self.margin / 2,
top: 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[0].height = Math.round(size.player[0].width / self.options.videoRatio);
size.player[1] = { size.player[1] = {

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

@ -185,7 +185,7 @@ Ox.VideoEditorPlayer = function(options, self) {
value: Ox.formatDuration(self.options.position, 3) value: Ox.formatDuration(self.options.position, 3)
}) })
.css({ .css({
float: 'right', float: 'right'
}) })
.appendTo(self.$controls) .appendTo(self.$controls)

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

@ -292,7 +292,7 @@ Ox.VideoPlayer = function(options, self) {
self.$videoContainer = Ox.Element() self.$videoContainer = Ox.Element()
.addClass('OxVideoContainer') .addClass('OxVideoContainer')
.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.$element)
@ -315,7 +315,7 @@ Ox.VideoPlayer = function(options, self) {
// and poster doesn't seem to work at all // and poster doesn't seem to work at all
Ox.extend({ Ox.extend({
preload: self.options.preload, preload: self.options.preload,
src: self.video, src: self.video
}, !self.options.paused && !self.options.playInToOut ? { }, !self.options.paused && !self.options.playInToOut ? {
/*autoplay: 'autoplay'*/ /*autoplay: 'autoplay'*/
} : {}/*, self.options.poster ? { } : {}/*, self.options.poster ? {
@ -443,7 +443,7 @@ Ox.VideoPlayer = function(options, self) {
}) })
.addClass('OxCensoredIcon OxVideo') .addClass('OxCensoredIcon OxVideo')
.attr({ .attr({
src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern'), src: Ox.UI.getImageURL('symbol' + self.options.censoredIcon, 'modern')
}) })
.hide() .hide()
.bindEvent({ .bindEvent({
@ -668,7 +668,7 @@ Ox.VideoPlayer = function(options, self) {
}) })
.addClass('OxPosition') .addClass('OxPosition')
.css({ .css({
width: self.positionWidth - 4 + 'px', width: self.positionWidth - 4 + 'px'
}) })
.html(formatPosition()) .html(formatPosition())
.bind({ .bind({
@ -1256,7 +1256,7 @@ Ox.VideoPlayer = function(options, self) {
css = { css = {
left: logoMargin + 'px', left: logoMargin + 'px',
top: logoMargin + (self.controlsTopAreVisible ? 16 : 0) + 'px', top: logoMargin + (self.controlsTopAreVisible ? 16 : 0) + 'px',
height: logoHeight + 'px', height: logoHeight + 'px'
}; };
} else if (element == 'player') { } else if (element == 'player') {
var height = self.options.fullscreen ? window.innerHeight : self.height; 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.$logo.unbind('mouseenter').unbind('mouseleave');
}); });
self.$subtitle && self.$subtitle.animate({ self.$subtitle && self.$subtitle.animate({
bottom: getCSS('subtitle').bottom, bottom: getCSS('subtitle').bottom
}, 250); }, 250);
} }
}, self.options.fullscreen ? 2500 : 1000); }, self.options.fullscreen ? 2500 : 1000);
@ -2007,7 +2007,7 @@ Ox.VideoPlayer = function(options, self) {
width: width width: width
}); });
self.$findInput.children('input').css({ self.$findInput.children('input').css({
width: (width - 12) + 'px', width: (width - 12) + 'px'
}); });
}); });
setSize(self.$volume, getCSS('volume'), animate, function() { setSize(self.$volume, getCSS('volume'), animate, function() {
@ -2110,7 +2110,7 @@ Ox.VideoPlayer = function(options, self) {
}); });
}); });
self.$subtitle && self.$subtitle.animate({ self.$subtitle && self.$subtitle.animate({
bottom: getCSS('subtitle').bottom, bottom: getCSS('subtitle').bottom
}, 250); }, 250);
} }
} }

12
source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js
View file

@ -203,7 +203,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$position = Ox.Element() self.$position = Ox.Element()
.addClass('OxPosition') .addClass('OxPosition')
.css({ .css({
width: self.positionWidth - 4 + 'px', width: self.positionWidth - 4 + 'px'
}) })
.html(formatPosition()) .html(formatPosition())
.bind({ .bind({
@ -309,7 +309,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0, left: 0,
top: 0, top: 0,
width: self.videoWidth + 'px', width: self.videoWidth + 'px',
height: self.tileHeight + 'px', height: self.tileHeight + 'px'
}) })
.appendTo(self.$frameBox); .appendTo(self.$frameBox);
@ -361,7 +361,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0, left: 0,
top: 0, top: 0,
width: self.videoWidth + 'px', width: self.videoWidth + 'px',
height: self.tileHeight + 'px', height: self.tileHeight + 'px'
}) })
.appendTo(self.$videoBox); .appendTo(self.$videoBox);
@ -391,11 +391,11 @@ Ox.VideoTimelinePlayer = function(options, self) {
self.$timeline.clone() self.$timeline.clone()
.css({ .css({
width: self.frame + self.videoWidth + 'px', width: self.frame + self.videoWidth + 'px',
marginLeft: -i * self.contentWidth + 'px', marginLeft: -i * self.contentWidth + 'px'
}), }),
self.$timeline.clone() self.$timeline.clone()
.css({ .css({
marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px', marginLeft: -i * self.contentWidth + self.videoWidth - 1 + 'px'
}) })
]; ];
self.$lines[i] self.$lines[i]
@ -591,7 +591,7 @@ Ox.VideoTimelinePlayer = function(options, self) {
left: 0, left: 0,
top: self.margin / 2 + 'px', top: self.margin / 2 + 'px',
width: self.frames + 'px', width: self.frames + 'px',
height: self.tileHeight + 'px', height: self.tileHeight + 'px'
//background: 'rgba(255, 0, 0, 0.5)' //background: 'rgba(255, 0, 0, 0.5)'
}) })
.appendTo($timeline); .appendTo($timeline);

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

@ -138,7 +138,7 @@ Ox.Dialog = function(options, self) {
}, },
dragstart: dragstart, dragstart: dragstart,
drag: drag, drag: drag,
dragend: dragend, dragend: dragend
}); });
self.hasButtons && self.$buttonsbar.css({ self.hasButtons && self.$buttonsbar.css({
cursor: 'move' cursor: 'move'
@ -362,7 +362,7 @@ Ox.Dialog = function(options, self) {
left: self.drag.left + ( left: self.drag.left + (
self.drag.width - self.options.width self.drag.width - self.options.width
) / (self.drag.fixedCenter ? 2 : 1), ) / (self.drag.fixedCenter ? 2 : 1),
width: self.options.width, width: self.options.width
}, self.drag.fixedRatio ? { }, self.drag.fixedRatio ? {
top: Math.max(Math.round( top: Math.max(Math.round(
self.drag.edge == 'topleft' self.drag.edge == 'topleft'
@ -394,7 +394,7 @@ Ox.Dialog = function(options, self) {
top: Math.max(self.drag.top + ( top: Math.max(self.drag.top + (
self.drag.height - self.options.height self.drag.height - self.options.height
) / (self.drag.fixedCenter ? 2 : 1), self.minTop), ) / (self.drag.fixedCenter ? 2 : 1), self.minTop),
height: self.options.height, height: self.options.height
}, (self.drag.fixedRatio) ? { }, (self.drag.fixedRatio) ? {
left: Math.round( left: Math.round(
self.drag.edge == 'topleft' self.drag.edge == 'topleft'
@ -423,7 +423,7 @@ Ox.Dialog = function(options, self) {
self.options.width = Math.round(self.options.height * ratio); self.options.width = Math.round(self.options.height * ratio);
} }
setCSS(Ox.extend({ setCSS(Ox.extend({
width: self.options.width, width: self.options.width
}, self.drag.fixedCenter ? { }, self.drag.fixedCenter ? {
left: self.drag.left + ( left: self.drag.left + (
self.drag.width - self.options.width self.drag.width - self.options.width
@ -456,7 +456,7 @@ Ox.Dialog = function(options, self) {
self.options.height = Math.round(self.options.width / ratio); self.options.height = Math.round(self.options.width / ratio);
} }
setCSS(Ox.extend({ setCSS(Ox.extend({
height: self.options.height, height: self.options.height
}, self.drag.fixedCenter ? { }, self.drag.fixedCenter ? {
top: Math.max(self.drag.top + ( top: Math.max(self.drag.top + (
self.drag.height - self.options.height self.drag.height - self.options.height

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

@ -18,7 +18,7 @@ Ox.Layer = function(options, self) {
.options(options || {}) .options(options || {})
.addClass('OxLayer Ox' + Ox.toTitleCase(self.options.type) + 'Layer') .addClass('OxLayer Ox' + Ox.toTitleCase(self.options.type) + 'Layer')
.bind(self.options.type == 'dialog' ? { .bind(self.options.type == 'dialog' ? {
mousedown: mousedown, mousedown: mousedown
} : { } : {
click: click click: click
}); });