sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

minor changes in OxJS

Browse source
This commit is contained in:
rolux 2012-01-06 17:27:54 +05:30
commit f76ee0cf36
6 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -449,8 +449,10 @@ Ox.Map = function(options, self) {
delete window.googleCallback;
initMap();
};
$.getScript(document.location.protocol
+ '//maps.google.com/maps/api/js?callback=googleCallback&sensor=false');
$.getScript(
document.location.protocol
+ '//maps.google.com/maps/api/js?callback=googleCallback&sensor=false'
);
} else {
(function interval() {
window.google ? initMap() : setTimeout(interval, 100);

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

@ -149,7 +149,7 @@ Ox.SmallVideoTimelineImage = function(options, self) {
Ox.loop(left, right, function(x) {
Ox.loop(top, bottom, function(y) {
var alpha = self.options.type == 'player' ? 128
: (y == top || y == bottom - 1) ? 255 : 64,
: (y == top || y == bottom - 1) ? 255 : 255,
color = Ox.Theme[self.theme].timeline[
self.options.editing ? 'editing'
: self.options.selected ? 'selected' : 'default'