From 68d50978ba4a0e1e85e74419b1b600df9b8c1911 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sat, 26 May 2012 15:48:19 +0000 Subject: [PATCH] trailing comma removal, --- source/Ox.UI/Ox.UI.js | 4 ++-- source/Ox.UI/js/Calendar/Ox.Calendar.js | 2 +- source/Ox.UI/js/Calendar/Ox.ListCalendar.js | 8 ++++---- source/Ox.UI/js/Code/Ox.DocPage.js | 6 +++--- source/Ox.UI/js/Code/Ox.ExamplePage.js | 2 +- source/Ox.UI/js/Code/Ox.SourceViewer.js | 2 +- source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js | 2 +- source/Ox.UI/js/Form/Ox.ArrayInput.js | 2 +- source/Ox.UI/js/Form/Ox.DateInput.js | 2 +- source/Ox.UI/js/Form/Ox.Editable.js | 2 +- source/Ox.UI/js/Form/Ox.FileInput.js | 2 +- source/Ox.UI/js/Form/Ox.Filter.js | 4 ++-- source/Ox.UI/js/Form/Ox.FormItem.js | 2 +- source/Ox.UI/js/Form/Ox.Input.js | 8 ++++---- source/Ox.UI/js/Form/Ox.ObjectArrayInput.js | 2 +- source/Ox.UI/js/Form/Ox.Range.js | 6 +++--- source/Ox.UI/js/List/Ox.Chart.js | 2 +- source/Ox.UI/js/List/Ox.IconItem.js | 2 +- source/Ox.UI/js/List/Ox.IconList.js | 2 +- source/Ox.UI/js/List/Ox.InfoList.js | 8 ++++---- source/Ox.UI/js/List/Ox.List.js | 6 +++--- source/Ox.UI/js/List/Ox.TextList.js | 2 +- source/Ox.UI/js/List/Ox.TreeList.js | 4 ++-- source/Ox.UI/js/Map/Ox.ListMap.js | 6 +++--- source/Ox.UI/js/Map/Ox.Map.js | 4 ++-- source/Ox.UI/js/Map/Ox.MapMarker.js | 2 +- source/Ox.UI/js/Map/Ox.MapMarkerImage.js | 2 +- source/Ox.UI/js/Map/Ox.MapPlace.js | 2 +- source/Ox.UI/js/Map/Ox.MapRectangle.js | 2 +- source/Ox.UI/js/Map/Ox.MapRectangleMarker.js | 2 +- source/Ox.UI/js/Menu/Ox.Menu.js | 4 ++-- source/Ox.UI/js/Menu/Ox.MenuButton.js | 2 +- source/Ox.UI/js/Panel/Ox.CollapsePanel.js | 2 +- source/Ox.UI/js/Video/Ox.AnnotationPanel.js | 2 +- source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js | 4 ++-- source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js | 2 +- source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js | 2 +- .../Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js | 2 +- source/Ox.UI/js/Video/Ox.VideoEditor.js | 10 +++++----- source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js | 2 +- source/Ox.UI/js/Video/Ox.VideoPlayer.js | 16 ++++++++-------- source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js | 12 ++++++------ source/Ox.UI/js/Window/Ox.Dialog.js | 10 +++++----- source/Ox.UI/js/Window/Ox.Layer.js | 2 +- 44 files changed, 87 insertions(+), 87 deletions(-) diff --git a/source/Ox.UI/Ox.UI.js b/source/Ox.UI/Ox.UI.js index 1b987131..273f34c7 100644 --- a/source/Ox.UI/Ox.UI.js +++ b/source/Ox.UI/Ox.UI.js @@ -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.$('') diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js index f53e0361..c9382f60 100644 --- a/source/Ox.UI/js/Calendar/Ox.Calendar.js +++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js @@ -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'}) diff --git a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js index e5e31033..59da08b4 100644 --- a/source/Ox.UI/js/Calendar/Ox.ListCalendar.js +++ b/source/Ox.UI/js/Calendar/Ox.ListCalendar.js @@ -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, diff --git a/source/Ox.UI/js/Code/Ox.DocPage.js b/source/Ox.UI/js/Code/Ox.DocPage.js index b799e633..45627ea2 100644 --- a/source/Ox.UI/js/Code/Ox.DocPage.js +++ b/source/Ox.UI/js/Code/Ox.DocPage.js @@ -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( $('') @@ -195,7 +195,7 @@ Ox.DocPage = function(options, self) { .addClass(className) .css({ borderWidth: '1px', - marginTop: '8px', + marginTop: '8px' }) ); } else { diff --git a/source/Ox.UI/js/Code/Ox.ExamplePage.js b/source/Ox.UI/js/Code/Ox.ExamplePage.js index aa8057ba..2b9d24c5 100644 --- a/source/Ox.UI/js/Code/Ox.ExamplePage.js +++ b/source/Ox.UI/js/Code/Ox.ExamplePage.js @@ -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', diff --git a/source/Ox.UI/js/Code/Ox.SourceViewer.js b/source/Ox.UI/js/Code/Ox.SourceViewer.js index a3a2f836..f102cde7 100644 --- a/source/Ox.UI/js/Code/Ox.SourceViewer.js +++ b/source/Ox.UI/js/Code/Ox.SourceViewer.js @@ -14,7 +14,7 @@ Ox.SourceViewer = function(options, self) { .defaults({ file: '', replaceCode: [], - replaceComment: [], + replaceComment: [] }) .options(options) .addClass('OxSourceViewer'); diff --git a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js index cbff321d..5a69ce20 100644 --- a/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js +++ b/source/Ox.UI/js/Code/Ox.SyntaxHighlighter.js @@ -33,7 +33,7 @@ Ox.SyntaxHighlighter = function(options, self) { showWhitespace: false, source: '', stripComments: false, - tabSize: 4, + tabSize: 4 }) .options(options || {}) .addClass('OxSyntaxHighlighter'); diff --git a/source/Ox.UI/js/Form/Ox.ArrayInput.js b/source/Ox.UI/js/Form/Ox.ArrayInput.js index db510bb8..b93482f9 100644 --- a/source/Ox.UI/js/Form/Ox.ArrayInput.js +++ b/source/Ox.UI/js/Form/Ox.ArrayInput.js @@ -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 diff --git a/source/Ox.UI/js/Form/Ox.DateInput.js b/source/Ox.UI/js/Form/Ox.DateInput.js index 70856c20..ad727a8f 100644 --- a/source/Ox.UI/js/Form/Ox.DateInput.js +++ b/source/Ox.UI/js/Form/Ox.DateInput.js @@ -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( diff --git a/source/Ox.UI/js/Form/Ox.Editable.js b/source/Ox.UI/js/Form/Ox.Editable.js index 76c84a37..da294447 100644 --- a/source/Ox.UI/js/Form/Ox.Editable.js +++ b/source/Ox.UI/js/Form/Ox.Editable.js @@ -112,7 +112,7 @@ Ox.Editable = function(options, self) { element: self.options.type == 'input' ? '' : '
', style: 'square', type: self.options.type, - value: formatInputValue(), + value: formatInputValue() }) .css(self.css) .bindEvent({ diff --git a/source/Ox.UI/js/Form/Ox.FileInput.js b/source/Ox.UI/js/Form/Ox.FileInput.js index ef46e180..ceb79600 100644 --- a/source/Ox.UI/js/Form/Ox.FileInput.js +++ b/source/Ox.UI/js/Form/Ox.FileInput.js @@ -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) { diff --git a/source/Ox.UI/js/Form/Ox.Filter.js b/source/Ox.UI/js/Form/Ox.Filter.js index 555af1e1..cdb3890d 100644 --- a/source/Ox.UI/js/Form/Ox.Filter.js +++ b/source/Ox.UI/js/Form/Ox.Filter.js @@ -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', diff --git a/source/Ox.UI/js/Form/Ox.FormItem.js b/source/Ox.UI/js/Form/Ox.FormItem.js index 3b7d04cb..5b26a67c 100644 --- a/source/Ox.UI/js/Form/Ox.FormItem.js +++ b/source/Ox.UI/js/Form/Ox.FormItem.js @@ -15,7 +15,7 @@ Ox.FormItem = function(options, self) { var that = Ox.Element({}, self) .defaults({ element: null, - error: '', + error: '' }) .options(options || {}) .addClass('OxFormItem'); diff --git a/source/Ox.UI/js/Form/Ox.Input.js b/source/Ox.UI/js/Form/Ox.Input.js index 71392370..9cfa7e79 100644 --- a/source/Ox.UI/js/Form/Ox.Input.js +++ b/source/Ox.UI/js/Form/Ox.Input.js @@ -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; } diff --git a/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js b/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js index cfc15d02..dc80bdbf 100644 --- a/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js +++ b/source/Ox.UI/js/Form/Ox.ObjectArrayInput.js @@ -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 diff --git a/source/Ox.UI/js/Form/Ox.Range.js b/source/Ox.UI/js/Form/Ox.Range.js index e225d883..e7049ef9 100644 --- a/source/Ox.UI/js/Form/Ox.Range.js +++ b/source/Ox.UI/js/Form/Ox.Range.js @@ -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 diff --git a/source/Ox.UI/js/List/Ox.Chart.js b/source/Ox.UI/js/List/Ox.Chart.js index 7ec2116a..42e841b6 100644 --- a/source/Ox.UI/js/List/Ox.Chart.js +++ b/source/Ox.UI/js/List/Ox.Chart.js @@ -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, diff --git a/source/Ox.UI/js/List/Ox.IconItem.js b/source/Ox.UI/js/List/Ox.IconItem.js index 6a1c8f90..e7faa0bf 100644 --- a/source/Ox.UI/js/List/Ox.IconItem.js +++ b/source/Ox.UI/js/List/Ox.IconItem.js @@ -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); diff --git a/source/Ox.UI/js/List/Ox.IconList.js b/source/Ox.UI/js/List/Ox.IconList.js index fcac1c5c..802e87d1 100644 --- a/source/Ox.UI/js/List/Ox.IconList.js +++ b/source/Ox.UI/js/List/Ox.IconList.js @@ -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)) diff --git a/source/Ox.UI/js/List/Ox.InfoList.js b/source/Ox.UI/js/List/Ox.InfoList.js index 2253dda9..aa983bcf 100644 --- a/source/Ox.UI/js/List/Ox.InfoList.js +++ b/source/Ox.UI/js/List/Ox.InfoList.js @@ -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); diff --git a/source/Ox.UI/js/List/Ox.List.js b/source/Ox.UI/js/List/Ox.List.js index fddc7be1..7386475c 100644 --- a/source/Ox.UI/js/List/Ox.List.js +++ b/source/Ox.UI/js/List/Ox.List.js @@ -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, diff --git a/source/Ox.UI/js/List/Ox.TextList.js b/source/Ox.UI/js/List/Ox.TextList.js index d7d9c982..d729fefe 100644 --- a/source/Ox.UI/js/List/Ox.TextList.js +++ b/source/Ox.UI/js/List/Ox.TextList.js @@ -872,7 +872,7 @@ Ox.TextList = function(options, self) { mousedown: function(e) { // keep mousedown from reaching list e.stopPropagation(); - }, + } }) .bindEvent({ blur: submit, diff --git a/source/Ox.UI/js/List/Ox.TreeList.js b/source/Ox.UI/js/List/Ox.TreeList.js index 69ddc790..6114bfcc 100644 --- a/source/Ox.UI/js/List/Ox.TreeList.js +++ b/source/Ox.UI/js/List/Ox.TreeList.js @@ -80,7 +80,7 @@ Ox.TreeList = function(options, self) { $('
') .addClass('OxCell OxTarget') .css({ - width: padding + 'px', + width: padding + 'px' }) .appendTo($item); } @@ -88,7 +88,7 @@ Ox.TreeList = function(options, self) { $('
') .addClass('OxCell') .css({ - width: '8px', + width: '8px' }) .append( // fixme: need Ox.Icon() diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js index 3fd653a0..83868761 100644 --- a/source/Ox.UI/js/Map/Ox.ListMap.js +++ b/source/Ox.UI/js/Map/Ox.ListMap.js @@ -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, diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js index d96e68b1..8a6b695e 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -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)'}); diff --git a/source/Ox.UI/js/Map/Ox.MapMarker.js b/source/Ox.UI/js/Map/Ox.MapMarker.js index 7cef066c..f9a657d4 100644 --- a/source/Ox.UI/js/Map/Ox.MapMarker.js +++ b/source/Ox.UI/js/Map/Ox.MapMarker.js @@ -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 }); diff --git a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js index 18f80a6d..d9767528 100644 --- a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js +++ b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js @@ -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 = [ diff --git a/source/Ox.UI/js/Map/Ox.MapPlace.js b/source/Ox.UI/js/Map/Ox.MapPlace.js index 021fbeb6..283fa64f 100644 --- a/source/Ox.UI/js/Map/Ox.MapPlace.js +++ b/source/Ox.UI/js/Map/Ox.MapPlace.js @@ -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) diff --git a/source/Ox.UI/js/Map/Ox.MapRectangle.js b/source/Ox.UI/js/Map/Ox.MapRectangle.js index 5abeaa29..d3e95bb9 100644 --- a/source/Ox.UI/js/Map/Ox.MapRectangle.js +++ b/source/Ox.UI/js/Map/Ox.MapRectangle.js @@ -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 array of markers diff --git a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js index a0d88350..283f1f20 100644 --- a/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js +++ b/source/Ox.UI/js/Map/Ox.MapRectangleMarker.js @@ -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] }); }; diff --git a/source/Ox.UI/js/Menu/Ox.Menu.js b/source/Ox.UI/js/Menu/Ox.Menu.js index 8210328f..4532276c 100644 --- a/source/Ox.UI/js/Menu/Ox.Menu.js +++ b/source/Ox.UI/js/Menu/Ox.Menu.js @@ -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(), diff --git a/source/Ox.UI/js/Menu/Ox.MenuButton.js b/source/Ox.UI/js/Menu/Ox.MenuButton.js index 73ba5ee3..331eadee 100644 --- a/source/Ox.UI/js/Menu/Ox.MenuButton.js +++ b/source/Ox.UI/js/Menu/Ox.MenuButton.js @@ -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, diff --git a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js index 35f06e7c..585be703 100644 --- a/source/Ox.UI/js/Panel/Ox.CollapsePanel.js +++ b/source/Ox.UI/js/Panel/Ox.CollapsePanel.js @@ -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 diff --git a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js index faf1a9ca..d384f291 100644 --- a/source/Ox.UI/js/Video/Ox.AnnotationPanel.js +++ b/source/Ox.UI/js/Video/Ox.AnnotationPanel.js @@ -139,7 +139,7 @@ Ox.AnnotationPanel = function(options, self) { that.triggerEvent('toggle' + ( layer.type == 'event' ? 'calendar' : 'map' ), data); - }, + } }) .appendTo(self.$folders); [ diff --git a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js index 1c105a3e..1c9ad15d 100644 --- a/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.BlockVideoTimeline.js @@ -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]); diff --git a/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js b/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js index 83f5e675..d3ac4dae 100644 --- a/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.LargeVideoTimeline.js @@ -133,7 +133,7 @@ Ox.LargeVideoTimeline = function(options, self) { function setMarker() { self.$markerPosition.css({ - left: self.center + 'px', + left: self.center + 'px' }); } diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 0a091c68..42fefd63 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -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) { diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js index e51822ec..2282c3fb 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimelineImage.js @@ -20,7 +20,7 @@ Ox.SmallVideoTimelineImage = function(options, self) { state: 'default', subtitles: [], type: '', - width: 256, + width: 256 }) .options(options || {}) .css({ diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 8431ae64..acc41e98 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -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] = { diff --git a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js index 83aca695..ad3ac4ce 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js @@ -185,7 +185,7 @@ Ox.VideoEditorPlayer = function(options, self) { value: Ox.formatDuration(self.options.position, 3) }) .css({ - float: 'right', + float: 'right' }) .appendTo(self.$controls) diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index dd70ada7..dcffdbcf 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -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); } } diff --git a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js index ff63d4e2..99029599 100644 --- a/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoTimelinePlayer.js @@ -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); diff --git a/source/Ox.UI/js/Window/Ox.Dialog.js b/source/Ox.UI/js/Window/Ox.Dialog.js index c6922f28..2d5ab13f 100644 --- a/source/Ox.UI/js/Window/Ox.Dialog.js +++ b/source/Ox.UI/js/Window/Ox.Dialog.js @@ -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 diff --git a/source/Ox.UI/js/Window/Ox.Layer.js b/source/Ox.UI/js/Window/Ox.Layer.js index 1ce50498..13c34561 100644 --- a/source/Ox.UI/js/Window/Ox.Layer.js +++ b/source/Ox.UI/js/Window/Ox.Layer.js @@ -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 });