[#316,timeline][m]: timeline now handles BC dates and has a switch to support non US dates dd/dd/dddd - fixes #316.
* upgrade timeine view to latest TimelineJS (note vendor code went in in last commit as needed to patch in this one) * Minor fix to TimelineJS timeline.js code (actual bug I think) * BC (-ve years) support is provided by latest TimelineJS (raw vendor code in last commit) * Strip out use of momentjs and just use timelinejs date parsing (various changes and tests around this) * state option nonUSDates: true to parse dd/mm/yyyy properly
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
<link rel="stylesheet" href="{{page.root}}vendor/leaflet.markercluster/MarkerCluster.Default.ie.css" />
|
||||
<![endif]-->
|
||||
<link rel="stylesheet" href="{{page.root}}vendor/slickgrid/2.0.1/slick.grid.css">
|
||||
<link rel="stylesheet" href="{{page.root}}vendor/timeline/20120520/css/timeline.css">
|
||||
<link rel="stylesheet" href="{{page.root}}vendor/timeline/2.24/css/timeline.css">
|
||||
|
||||
<!-- Recline CSS components -->
|
||||
<link rel="stylesheet" href="{{page.root}}css/grid.css">
|
||||
@@ -36,7 +36,7 @@
|
||||
<script type="text/javascript" src="{{page.root}}vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js"></script>
|
||||
<script type="text/javascript" src="{{page.root}}vendor/slickgrid/2.0.1/slick.grid.min.js"></script>
|
||||
<script type="text/javascript" src="{{page.root}}vendor/moment/2.0.0/moment.js"></script>
|
||||
<script type="text/javascript" src="{{page.root}}vendor/timeline/20120520/js/timeline.js"></script>
|
||||
<script type="text/javascript" src="{{page.root}}vendor/timeline/2.24/js/timeline.js"></script>
|
||||
<!--[if lte IE 7]>
|
||||
<script language="javascript" type="text/javascript" src="{{page.root}}vendor/json/json2.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
Reference in New Issue
Block a user