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

temporary fix for video skipping bug (#716); add third parameter (index) to forEach callback; add Geo colors

Browse source
This commit is contained in:
rlx 2012-03-25 21:23:03 +00:00
commit 17aca54e7a
5 changed files with 57 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

29
demos/fileinput/js/fileinput.js
View file

@ -24,9 +24,9 @@ Ox.load('UI', function() {
$main = Ox.Element()
.append(
Ox.Label({
textAlign: 'center',
title: 'File Button',
Ox.FileButton({
maxFiles: 1,
title: 'Select File...',
width: 128
})
.css({
@ -37,20 +37,7 @@ Ox.load('UI', function() {
)
.append(
Ox.FileButton({
maxFiles: 1,
title: 'Select File...',
width: 128
})
.css({
position: 'absolute',
left: '160px',
top: '16px'
})
)
.append(
Ox.Label({
textAlign: 'center',
title: 'File Input',
title: 'Select Files...',
width: 128
})
.css({
@ -66,8 +53,8 @@ Ox.load('UI', function() {
})
.css({
position: 'absolute',
left: '160px',
top: '48px'
left: '16px',
top: '80px'
})
)
.append(
@ -76,8 +63,8 @@ Ox.load('UI', function() {
})
.css({
position: 'absolute',
left: '160px',
top: '80px'
left: '16px',
top: '112px'
})
),

28
demos/listmap/js/listmap.js
View file

@ -1,31 +1,5 @@
Ox.load({UI: {}, Geo: {}}, function() {
var markerColor = {
'Northern America': [64, 64, 255],
'Central America': [0, 0, 255],
'Caribbean': [0, 0, 128],
'Southern America': [0, 255, 0],
'Northern Europe': [255, 255, 192],
'Western Europe': [255, 255, 0],
'Eastern Europe': [255, 128, 0],
'Southern Europe': [128, 128, 0],
'Northern Africa': [128, 128, 128],
'Western Africa': [64, 64, 128],
'Middle Africa': [64, 64, 64],
'Eastern Africa': [128, 64, 64],
'Southern Africa': [64, 128, 64],
'Western Asia': [255, 128, 128],
'Central Asia': [255, 0, 0],
'Eastern Asia': [128, 0, 0],
'Southern Asia': [255, 0, 255],
'South-Eastern Asia': [128, 0, 128],
'Australia and New Zealand': [0, 128, 128],
'Micronesia': [192, 255, 255],
'Melanesia': [0, 255, 255],
'Polynesia': [128, 128, 255],
'Antarctica': [192, 192, 192]
},
$listmap = new Ox.ListMap({
height: window.innerHeight,
places: Ox.COUNTRIES.map(function(place) {
@ -37,7 +11,7 @@ Ox.load({UI: {}, Geo: {}}, function() {
flag: place.code,
geoname: place.name,
id: place.code,
markerColor: markerColor[place.region] || [128,128,128],
markerColor: Ox.getGeoColor(place.region),
name: place.name,
type: 'country',
lat: place.lat,