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

minor changes

Browse source
This commit is contained in:
rlx 2012-01-17 23:26:26 +05:30
parent 2bf92c982a
commit 1bf1eae034
5 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/Ox.UI/js/Core/Ox.Element.js
View file

@ -387,7 +387,6 @@ Ox.Element = function(options, self) {
key <str> the name of the option key <str> the name of the option
value <val> the value of the option value <val> the value of the option
@*/ @*/
that.options = function() { that.options = function() {
return Ox.getset(self.options, arguments, self.setOption, that); return Ox.getset(self.options, arguments, self.setOption, that);
}; };

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

@ -31,7 +31,10 @@ Ox.MapMarkerImage = (function() {
if (!cache[index]) { if (!cache[index]) {
var color = options.type == 'rectangle' ? [0, 0, 0, 0] 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( border = Ox.merge(
options.mode == 'normal' ? [0, 0, 0] options.mode == 'normal' ? [0, 0, 0]
: options.mode == 'selected' ? [255, 255, 255] : options.mode == 'selected' ? [255, 255, 255]
@ -55,7 +58,6 @@ Ox.MapMarkerImage = (function() {
new google.maps.Point(0, 0), new google.maps.Point(0, 0),
new google.maps.Point(r, r) new google.maps.Point(r, r)
); );
//Ox.Log('Map', options, 'index', index)
} }
return cache[index]; return cache[index];

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

@ -65,10 +65,10 @@ Ox.MapPlace = function(options) {
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)
Ox.EARTH_CIRCUMFERENCE / 360; * Ox.EARTH_CIRCUMFERENCE / 360;
that.sizeEastWest = (that.east + (that.west > that.east ? 360 : 0) - that.west) * that.sizeEastWest = (that.east + (that.west > that.east ? 360 : 0) - that.west)
Ox.getMetersPerDegree(that.lat); * Ox.getMetersPerDegree(that.lat);
that.area = Ox.getArea( that.area = Ox.getArea(
{lat: that.south, lng: that.west}, {lat: that.south, lng: that.west},
{lat: that.north, lng: that.east} {lat: that.north, lng: that.east}

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

@ -46,7 +46,11 @@ Ox.MapRectangle = function(options, self) {
setOptions(); setOptions();
function click() { 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(); that.place.edit();
} else if (that.map.getKey() == 'meta') { } else if (that.map.getKey() == 'meta') {
that.place.submit(); that.place.submit();

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

@ -107,8 +107,8 @@ Ox.SmallVideoTimeline = function(options, self) {
function getPosition(e) { function getPosition(e) {
var position = ( var position = (
(e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left) - (e.offsetX ? e.offsetX : e.clientX - $(e.target).offset().left)
(self.options.type == 'player' ? 8 : 0) - (self.options.type == 'player' ? 8 : 0)
) * self.options.duration / self.imageWidth; ) * self.options.duration / self.imageWidth;
return Ox.limit(position, 0, self.options.duration); return Ox.limit(position, 0, self.options.duration);
} }
@ -146,12 +146,16 @@ Ox.SmallVideoTimeline = function(options, self) {
function getTooltip(e) { function getTooltip(e) {
var position = getPosition(e), var position = getPosition(e),
subtitle = getSubtitle(position); subtitle = getSubtitle(position);
return subtitle ? '<span class=\'OxBright\'>' + Ox.highlight( return subtitle
subtitle.text, self.options.find, 'OxHighlight' ? '<span class=\'OxBright\'>' + Ox.highlight(
).replace(/\n/g, '<br/>') + '</span><br/>' + subtitle.text, self.options.find, 'OxHighlight'
Ox.formatDuration(subtitle['in'], self.options.showMilliseconds) + ' - ' + ).replace(/\n/g, '<br/>') + '</span><br/>'
Ox.formatDuration(subtitle['out'], self.options.showMilliseconds) : + Ox.formatDuration(
Ox.formatDuration(position, self.options.showMilliseconds); subtitle['in'], self.options.showMilliseconds
) + ' - ' + Ox.formatDuration(
subtitle['out'], self.options.showMilliseconds
)
: Ox.formatDuration(position, self.options.showMilliseconds);
} }
function mousedown(e) { function mousedown(e) {