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

adding some more dates

Browse source
This commit is contained in:
rlx 2011-04-20 12:44:11 +00:00
parent 1c05a7945f
commit 1b33b7fdad
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/js/ox.ui.js
View file

@ -10913,7 +10913,7 @@ requires
return i * 86400000;
},
name: function(i) {
return Ox.formatDate(new Date(i * 86400000), '%a, %b %e, %Y');
return Ox.formatDate(new Date(i * 86400000), '%b %e, %Y');
},
value: function(date) {
return Math.floor(date / 86400000);

34
demos/calendar/js/calendar.js
View file

@ -5,12 +5,31 @@ $(function() {
new Ox.Calendar({
date: new Date(0),
dates: [
{name: 'December 1969', start: new Date('1969-12-01'), stop: new Date('1970-01-01')},
{name: 'Renaissance', start: new Date('1300'), stop: new Date('1700')},
{name: 'Declaration of Independence', start: new Date('1776-07-04'), stop: new Date('1776-07-05')},
{name: 'French Revolution', start: new Date('1789'), stop: new Date('1800')},
{name: 'Storming of the Bastille', start: new Date('1789-07-14'), stop: new Date('1789-07-15')},
{name: 'Napoleonic Era', start: new Date('1799-11-09'), stop: new Date('1815-06-29')},
{name: 'The Year Without a Summer', start: new Date('1816'), stop: new Date('1817')},
{name: 'American Civil War', start: new Date('1861-04-12'), stop: new Date('1865-04-10')},
{name: 'Paris Commune', start: new Date('1871-03-18'), stop: new Date('1871-05-29')},
{name: '20th century', start: new Date('1900-01-01'), stop: new Date('2000-01-01')},
{name: 'World War One', start: new Date('1914-01-01'), stop: new Date('1919-01-01')},
{name: 'World War One', start: new Date('1914-07-28'), stop: new Date('1918-11-12')},
{name: 'Russian Revolution', start: new Date('1917'), stop: new Date('1918')},
{name: 'October Revolution', start: new Date('1917-11-07'), stop: new Date('1917-11-09')},
{name: 'Treaty of Versailles', start: new Date('1919-06-28'), stop: new Date('1919-06-29')},
{name: 'The Third Reich', start: new Date('1933-01-30'), stop: new Date('1945-05-09')},
{name: 'World War Two', start: new Date('1939-01-01'), stop: new Date('1946-01-01')},
{name: 'Spanish Civil War', start: new Date('1936-07-17'), stop: new Date('1939-04-02')},
{name: '1936 Summer Olympics', start: new Date('1936-08-01'), stop: new Date('1936-08-17')},
{name: 'World War Two', start: new Date('1939-09-01'), stop: new Date('1945-09-03')},
{name: 'Wannsee Conference', start: new Date('1942-01-20'), stop: new Date('1942-01-21')},
{name: 'Hiroshima', start: new Date('1945-08-06'), stop: new Date('1945-08-07')},
{name: 'Nagasaki', start: new Date('1945-08-09'), stop: new Date('1945-08-10')},
{name: 'Korean War', start: new Date('1950-06-25'), stop: new Date('1953-07-28')},
{name: 'Cuban Revolution', start: new Date('1953-07-26'), stop: new Date('1959-01-02')},
{name: 'Vietnam War', start: new Date('1955-11-01'), stop: new Date('1975-05-01')},
{name: '1960s', start: new Date('1960-01-01'), stop: new Date('1970-01-01')},
{name: 'Bay of Pigs', start: new Date('1961-04-17'), stop: new Date('1961-04-20')},
{name: 'Assassination of John F. Kennedy', start: new Date('1963-11-22'), stop: new Date('1963-11-23')},
{name: 'Assassination of Benno Ohnesorg', start: new Date('1967-06-02'), stop: new Date('1967-06-03')},
{name: '1968', start: new Date('1968-01-01'), stop: new Date('1969-01-01')},
@ -22,8 +41,17 @@ $(function() {
{name: 'Apollo 11', start: new Date('1969-07-16'), stop: new Date('1969-07-25')},
{name: 'Moon Landing', start: new Date('1969-07-20'), stop: new Date('1969-07-21')},
{name: 'The Epoch', start: new Date('1970-01-01 00:00:00'), stop: new Date('1970-01-01 00:00:01')},
{name: '1970s', start: new Date('1970-01-01'), stop: new Date('1980-01-01')},
{name: '1972 Summer Olympics', start: new Date('1972-08-26'), stop: new Date('1972-09-11')},
{name: 'Apollo 17', start: new Date('1972-12-07'), stop: new Date('1972-12-20')},
{name: '1980s', start: new Date('1980-01-01'), stop: new Date('1990-01-01')},
{name: 'Iran-Iraq War', start: new Date('1980-09-22'), stop: new Date('1988-08-21')},
{name: 'Tschernobyl', start: new Date('1986-04-26'), stop: new Date('1986-04-27')},
{name: 'Fall of the Berlin Wall', start: new Date('1989-11-09'), stop: new Date('1989-11-10')},
{name: 'Gulf War', start: new Date('1990-08-02'), stop: new Date('1991-03-01')},
{name: 'German Reunification', start: new Date('1990-10-03'), stop: new Date('1990-10-04')},
{name: 'The Battle of Seattle', start: new Date('1999-11-30'), stop: new Date('1999-12-01')},
{name: 'George W. Bush', start: new Date('2001-01-20'), stop: new Date('2009-01-20')},
{name: '9-11', start: new Date('2001-09-11'), stop: new Date('2001-09-12')}
],
height: window.innerHeight,