diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js index d6d84780..ba6f57b4 100644 --- a/source/Ox.UI/js/Core/Ox.Element.js +++ b/source/Ox.UI/js/Core/Ox.Element.js @@ -387,7 +387,6 @@ Ox.Element = function(options, self) { key the name of the option value the value of the option @*/ - that.options = function() { return Ox.getset(self.options, arguments, self.setOption, that); }; diff --git a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js index f3e30d59..ef3e9117 100644 --- a/source/Ox.UI/js/Map/Ox.MapMarkerImage.js +++ b/source/Ox.UI/js/Map/Ox.MapMarkerImage.js @@ -31,7 +31,10 @@ Ox.MapMarkerImage = (function() { if (!cache[index]) { var color = options.type == 'rectangle' ? [0, 0, 0, 0] - : Ox.merge(Ox.clone(options.color), [options.type == 'place' ? 0.75 : 0.25]), + : Ox.merge( + Ox.clone(options.color), + [options.type == 'place' ? 0.75 : 0.25] + ), border = Ox.merge( options.mode == 'normal' ? [0, 0, 0] : options.mode == 'selected' ? [255, 255, 255] @@ -55,7 +58,6 @@ Ox.MapMarkerImage = (function() { new google.maps.Point(0, 0), new google.maps.Point(r, r) ); - //Ox.Log('Map', options, 'index', index) } return cache[index]; diff --git a/source/Ox.UI/js/Map/Ox.MapPlace.js b/source/Ox.UI/js/Map/Ox.MapPlace.js index 8b384616..f42f435c 100644 --- a/source/Ox.UI/js/Map/Ox.MapPlace.js +++ b/source/Ox.UI/js/Map/Ox.MapPlace.js @@ -65,10 +65,10 @@ Ox.MapPlace = function(options) { w: new google.maps.LatLng(that.lat, that.west), }); // fixme: use bounds.toSpan() - that.sizeNorthSouth = (that.north - that.south) * - Ox.EARTH_CIRCUMFERENCE / 360; - that.sizeEastWest = (that.east + (that.west > that.east ? 360 : 0) - that.west) * - Ox.getMetersPerDegree(that.lat); + that.sizeNorthSouth = (that.north - that.south) + * Ox.EARTH_CIRCUMFERENCE / 360; + that.sizeEastWest = (that.east + (that.west > that.east ? 360 : 0) - that.west) + * Ox.getMetersPerDegree(that.lat); that.area = Ox.getArea( {lat: that.south, lng: that.west}, {lat: that.north, lng: that.east} diff --git a/source/Ox.UI/js/Map/Ox.MapRectangle.js b/source/Ox.UI/js/Map/Ox.MapRectangle.js index 2634e0cf..c9bb4057 100644 --- a/source/Ox.UI/js/Map/Ox.MapRectangle.js +++ b/source/Ox.UI/js/Map/Ox.MapRectangle.js @@ -46,7 +46,11 @@ Ox.MapRectangle = function(options, self) { setOptions(); function click() { - if (that.map.options('editable') && that.place.editable && !that.place.editing) { + if ( + that.map.options('editable') + && that.place.editable + && !that.place.editing + ) { that.place.edit(); } else if (that.map.getKey() == 'meta') { that.place.submit(); diff --git a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js index 3e345cd2..15e1a2af 100644 --- a/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/Ox.SmallVideoTimeline.js @@ -107,8 +107,8 @@ Ox.SmallVideoTimeline = function(options, self) { function getPosition(e) { var position = ( - (e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left) - - (self.options.type == 'player' ? 8 : 0) + (e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left) + - (self.options.type == 'player' ? 8 : 0) ) * self.options.duration / self.imageWidth; return Ox.limit(position, 0, self.options.duration); } @@ -146,12 +146,16 @@ Ox.SmallVideoTimeline = function(options, self) { function getTooltip(e) { var position = getPosition(e), subtitle = getSubtitle(position); - return subtitle ? '' + Ox.highlight( - subtitle.text, self.options.find, 'OxHighlight' - ).replace(/\n/g, '
') + '

' + - Ox.formatDuration(subtitle['in'], self.options.showMilliseconds) + ' - ' + - Ox.formatDuration(subtitle['out'], self.options.showMilliseconds) : - Ox.formatDuration(position, self.options.showMilliseconds); + return subtitle + ? '' + Ox.highlight( + subtitle.text, self.options.find, 'OxHighlight' + ).replace(/\n/g, '
') + '

' + + Ox.formatDuration( + subtitle['in'], self.options.showMilliseconds + ) + ' - ' + Ox.formatDuration( + subtitle['out'], self.options.showMilliseconds + ) + : Ox.formatDuration(position, self.options.showMilliseconds); } function mousedown(e) {