@ -1,5 +1,5 @@
/ *
/ *
TimelineJS - ver . 2015 - 06 - 10 - 15 - 48 - 54 - 2015 - 06 - 10
TimelineJS - ver . 2015 - 06 - 10 - 16 - 17 - 35 - 2015 - 06 - 10
Copyright ( c ) 2012 - 2015 Northwestern University
Copyright ( c ) 2012 - 2015 Northwestern University
a project of the Northwestern University Knight Lab , originally created by Zach Wise
a project of the Northwestern University Knight Lab , originally created by Zach Wise
https : //github.com/NUKnightLab/TimelineJS
https : //github.com/NUKnightLab/TimelineJS
@ -1500,10 +1500,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Date == 'undefined') {
}
}
if ( type . of ( d ) != "date" ) {
if ( type . of ( d ) == "date" ) {
trace ( "Expected a 'date' type" ) ;
return d ;
} else {
if ( type . of ( p ) == "object" ) {
if ( type . of ( p ) == "object" ) {
if ( p . millisecond || p . second && d . getSeconds ( ) >= 1 ) {
if ( p . millisecond || p . second && d . getSeconds ( ) >= 1 ) {
@ -1614,6 +1611,9 @@ if(typeof VMM != 'undefined' && typeof VMM.Date == 'undefined') {
}
}
}
}
} else {
trace ( "NOT A VALID DATE?" ) ;
trace ( d ) ;
}
}
if ( is _pair ) {
if ( is _pair ) {
@ -7225,10 +7225,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
} ;
} ;
function onDatesProcessed ( ) {
build ( ) ;
}
function reSize ( ) {
function reSize ( ) {
updateSize ( ) ;
updateSize ( ) ;
@ -7435,7 +7431,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
/ * B U I L D D I S P L A Y
/ * B U I L D D I S P L A Y
=== === === === === === === === === === === === === === === === == * /
=== === === === === === === === === === === === === === === === == * /
function build ( ) {
function build ( ) {
if ( ! ( data && data . length && data . length > 0 ) ) {
if ( ! ( data && data . date && data . date . length && data . date . length > 0 ) ) {
showMessege ( null , "Error reading data." ) ;
showMessege ( null , "Error reading data." ) ;
return ;
return ;
}
}
@ -7511,6 +7507,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
} ;
} ;
// BUILD DATE OBJECTS
// BUILD DATE OBJECTS
// called from onDataReady, passes to function build
function buildDates ( ) {
function buildDates ( ) {
_dates = [ ] ;
_dates = [ ] ;
@ -7653,7 +7650,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
} ) ;
} ) ;
}
}
onDatesProcesse d( ) ;
buil d( ) ;
}
}
} ;
} ;
@ -9570,7 +9567,7 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
if ( dd _type . match ( "start" ) || dd _type . match ( "title" ) ) {
if ( dd _type . match ( "start" ) || dd _type . match ( "title" ) ) {
if ( data _obj . timeline . startDate ) {
if ( data _obj . timeline . startDate ) {
VMM . fireEvent ( global , VMM . Timeline . Config . events . messege , "Multiple 'title' slides. You should only have one row with 'title' in the 'type' column." ) ;
VMM . fireEvent ( global , VMM . Timeline . Config . events . messege , "Invalid data: Multiple 'title' slides. You should only have one row with 'title' in the 'type' column." ) ;
return ;
return ;
}
}
data _obj . timeline . startDate = getGVar ( dd . gsx$startdate ) ;
data _obj . timeline . startDate = getGVar ( dd . gsx$startdate ) ;