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

[timeline][xs]: micro followup to upgrade of timeline in ccf60d00f0.

Browse Source 
* tweak to test
* update tutorial to reference right vendor libs
This commit is contained in:
Rufus Pollock
2013-08-23 10:03:44 +01:00
parent ab14d48939
commit 191dd5796f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 %} {% highlight html %}
<!-- css --> <!-- css -->
<link rel="stylesheet" href="vendor/timeline/20120520/css/timeline.css"> <link rel="stylesheet" href="vendor/timeline/2.24/css/timeline.css">
<!-- javascript --> <!-- javascript -->
<script type="text/javascript" src="vendor/moment/2.0.0/moment.js"></script> <script type="text/javascript" src="vendor/moment/2.0.0/moment.js"></script>
<script type="text/javascript" src="vendor/timeline/20120520/js/timeline.js"></script> <script type="text/javascript" src="vendor/timeline/2.24/js/timeline.js"></script>
{% endhighlight %} {% endhighlight %}
Now, create a new div for the map (must have an explicit height for the timeline to render): Now, create a new div for the map (must have an explicit height for the timeline to render):

2
test/index.html
View File

@@ -5,6 +5,8 @@
<title>Qunit Tests</title> <title>Qunit Tests</title>
<link rel="stylesheet" href="qunit/qunit.css" type="text/css" media="screen" /> <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/2.24/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"> <link rel="stylesheet" href="../css/flot.css">
<link rel="stylesheet" href="../vendor/leaflet/0.4.4/leaflet.css"> <link rel="stylesheet" href="../vendor/leaflet/0.4.4/leaflet.css">
<link rel="stylesheet" href="../vendor/leaflet.markercluster/MarkerCluster.css"> <link rel="stylesheet" href="../vendor/leaflet.markercluster/MarkerCluster.css">

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

@@ -43,11 +43,10 @@ test('render etc', function () {
}); });
$('.fixtures').append(view.el); $('.fixtures').append(view.el);
view.render(); view.render();
view._initTimeline();
assertPresent('.vco-timeline', view.el); assertPresent('.vco-timeline', view.el);
assertPresent('.timenav', view.el); assertPresent('.timenav', view.el);
assertPresent('.timenav', view.el); assertPresent('.timenav', view.el);
equal(view.$el.find('.marker.active h3').text(), 'firstfirst'); equal(view.$el.find('.marker.active h3').text(), 'first');
view.remove(); view.remove();
}); });