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

Merge pull request #302 from okfn/fix-timeline-test

Browse Source 
[timeline][xs]: Fix timeline test and remove old HACK that is no longer needed - thx to @stefanw.
This commit is contained in:
Rufus Pollock
2013-01-08 06:13:12 -08:00
parent ea1bced824 2c79d00f09
commit 896686c466
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/view.timeline.js
View File

@@ -146,11 +146,6 @@ my.Timeline = Backbone.View.extend({
if (out.toDate() == 'Invalid Date') { if (out.toDate() == 'Invalid Date') {
return null; return null;
} else { } else {
// fix for moment weirdness around date parsing and time zones
// moment('1914-08-01').toDate() => 1914-08-01 00:00 +01:00
// which in iso format (with 0 time offset) is 31 July 1914 23:00
// meanwhile native new Date('1914-08-01') => 1914-08-01 01:00 +01:00
out = out.subtract('minutes', out.zone());
return out.toDate(); return out.toDate();
} }
}, },

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

@@ -47,7 +47,7 @@ test('render etc', function () {
assertPresent('.vmm-timeline', view.el); assertPresent('.vmm-timeline', view.el);
assertPresent('.timenav', view.el); assertPresent('.timenav', view.el);
assertPresent('.timenav', view.el); assertPresent('.timenav', view.el);
equal('2011', view.el.find('.marker.active h4').text()); equal(view.el.find('.marker.active h4').text(), '2011');
view.remove(); view.remove();
}); });