knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#316,timeline][s]: complete upgrade to v2.25 of timelinejs with support for BC dates <= 10k BC.

Browse Source
This commit is contained in:
Rufus Pollock 2013-08-24 13:25:28 +01:00
parent fddea8e882
commit c8f7ab56ff
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_includes/recline-deps.html
View File

@ -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/2.24/css/timeline.css">
<link rel="stylesheet" href="{{page.root}}vendor/timeline/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/2.24/js/timeline.js"></script>
<script type="text/javascript" src="{{page.root}}vendor/timeline/js/timeline.js"></script>
<!--[if lte IE 7]>
<script language="javascript" type="text/javascript" src="{{page.root}}vendor/json/json2.js"></script>
<![endif]-->

4
docs/tutorial-views.markdown
View File

@ -248,11 +248,11 @@ First, add the additional dependencies for the timeline view. The timeline is bu
{% highlight html %}
<!-- css -->
<link rel="stylesheet" href="vendor/timeline/2.24/css/timeline.css">
<link rel="stylesheet" href="vendor/timeline/css/timeline.css">
<!-- javascript -->
<script type="text/javascript" src="vendor/moment/2.0.0/moment.js"></script>
<script type="text/javascript" src="vendor/timeline/2.24/js/timeline.js"></script>
<script type="text/javascript" src="vendor/timeline/js/timeline.js"></script>
{% endhighlight %}
Now, create a new div for the map (must have an explicit height for the timeline to render):

4
test/index.html
View File

@ -4,7 +4,7 @@
<head>
<title>Qunit Tests</title>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../vendor/timeline/2.24/css/timeline.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../vendor/timeline/css/timeline.css" type="text/css" media="screen" />
<link rel="stylesheet" href="../css/timeline.css" type="text/css" media="screen" />
<style type="text/css">.recline-timeline { height: 400px; }</style>
<link rel="stylesheet" href="../css/flot.css">
@ -26,7 +26,7 @@
<script type="text/javascript" src="../vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="../vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js"></script>
<script type="text/javascript" src="../vendor/slickgrid/2.0.1/slick.grid.min.js"></script>
<script type="text/javascript" src="../vendor/timeline/2.24/js/timeline.js"></script>
<script type="text/javascript" src="../vendor/timeline/js/timeline.js"></script>
<!--[if lte IE 7]>
<script language="javascript" type="text/javascript" src="../vendor/json/json2.js"></script>
<![endif]-->

9
test/view.timeline.test.js
View File

@ -37,7 +37,13 @@ test('extract dates and timelineJSON', function () {
});
test('render etc', function () {
var dataset = Fixture.getDataset();
var dataset = new recline.Model.Dataset({
records: [
{'Date': '-10000', 'title': 'first'},
{'Date': '2012-03-20', 'title': 'second'},
{'Date': '2012-03-25', 'title': 'third'}
]
});
var view = new recline.View.Timeline({
model: dataset
});
@ -63,6 +69,7 @@ test('_parseDate', function () {
[ '1914-08-01T08:00', '1914,08,01,08,00' ],
[ '03-20-1914', '03/20/1914' ],
[ '20/03/1914', '20/03/1914' ],
[ '-10000', '-10000' ],
[ null, null ]
];
_.each(testData, function(item) {

10
vendor/timeline/js/timeline.js vendored
View File

@ -7300,7 +7300,13 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
createConfig(c);
createStructure();
if (type.of(_data) == "string") {
// FIX
// Current is
// if (type.of(_data) == "string") {
// BUT surely should just be
// type.of(_data) !== null
// OR - should not allow _data as an argument
if (type.of(_data) !== null) {
config.source = _data;
}
@ -10006,4 +10012,4 @@ if (typeof VMM.Timeline !== 'undefined' && typeof VMM.Timeline.DataObj == 'undef
};
}
}