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

merging changes

Browse source
This commit is contained in:
rolux 2011-06-01 09:45:21 +02:00
parent 61404dd776
commit 0c88632437
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demos/calendar/js/calendar.js
View file

@ -428,6 +428,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Claude Roy', start: '1915-08-28', end: '1997-12-13', type: 'person'}, {name: 'Claude Roy', start: '1915-08-28', end: '1997-12-13', type: 'person'},
{name: 'Ingrid Bergman', start: '1915-08-29', end: '1982-08-29', type: 'person'}, {name: 'Ingrid Bergman', start: '1915-08-29', end: '1982-08-29', type: 'person'},
{name: 'Roland Barthes', start: '1915-11-12', end: '1980-03-25', type: 'person'}, {name: 'Roland Barthes', start: '1915-11-12', end: '1980-03-25', type: 'person'},
{name: 'Yehudi Menuhin', start: '1916-04-22', end: '1999-03-12', type: 'person'},
{name: 'François Mitterrand', start: '1916-10-26', end: '1996-01-08', type: 'person'}, {name: 'François Mitterrand', start: '1916-10-26', end: '1996-01-08', type: 'person'},
{name: 'John F. Kennedy', start: '1917-05-29', end: '1963-11-22', type: 'person'}, {name: 'John F. Kennedy', start: '1917-05-29', end: '1963-11-22', type: 'person'},
{name: 'Jean-Pierre Melville', start: '1917-10-20', end: '1973-08-02', type: 'person'}, {name: 'Jean-Pierre Melville', start: '1917-10-20', end: '1973-08-02', type: 'person'},
@ -566,6 +567,7 @@ Ox.load('UI', {debug: true, hideScreen: true, showScreen: true, theme: 'modern'}
{name: 'Treaty of Versailles', start: '1919-06-28', end: '1919-06-29', type: 'other'}, {name: 'Treaty of Versailles', start: '1919-06-28', end: '1919-06-29', type: 'other'},
{name: 'Spanish Civil War', start: '1936-07-17', end: '1939-04-01', type: 'other'}, {name: 'Spanish Civil War', start: '1936-07-17', end: '1939-04-01', type: 'other'},
{name: '1936 Summer Olympics', start: '1936-08-01', end: '1936-08-16', type: 'other'}, {name: '1936 Summer Olympics', start: '1936-08-01', end: '1936-08-16', type: 'other'},
{name: 'Guernica', start: '1937-04-26', end: '1937-04-27', type: 'other'},
{name: 'Hindenburg', start: '1937-05-06', end: '1937-05-07', type: 'other'}, {name: 'Hindenburg', start: '1937-05-06', end: '1937-05-07', type: 'other'},
{name: 'World War Two', start: '1939-09-01', end: '1945-09-02', type: 'other'}, {name: 'World War Two', start: '1939-09-01', end: '1945-09-02', type: 'other'},
{name: 'Pearl Harbour', start: '1941-12-07', end: '1941-12-08', type: 'other'}, {name: 'Pearl Harbour', start: '1941-12-07', end: '1941-12-08', type: 'other'},

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

@ -21,13 +21,13 @@ Ox.MapMarker = function(options) {
var that = this, var that = this,
typeColor = { typeColor = {
country: [0, 128, 255], country: [64, 64, 255],
region: [255, 0, 255], region: [0, 192, 192],
city: [255, 0, 0], city: [255, 0, 0],
borough: [255, 128, 0], borough: [255, 128, 0],
street: [255, 255, 0], street: [255, 255, 0],
premise: [0, 192, 0], premise: [128, 255, 0],
feature: [64, 64, 255], feature: [0, 192, 0],
other: [128, 128, 128] other: [128, 128, 128]
}, },
areaSize = { areaSize = {