From 616d6b2ed8c79c7ed391ed058939b21e187d0ec9 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Mon, 7 Jan 2013 10:33:00 +0100 Subject: [PATCH 1/2] Fix order of equal arguments --- test/view.timeline.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/view.timeline.test.js b/test/view.timeline.test.js index 77014a68..4f6faf48 100644 --- a/test/view.timeline.test.js +++ b/test/view.timeline.test.js @@ -47,7 +47,7 @@ test('render etc', function () { assertPresent('.vmm-timeline', 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(); }); From 2c79d00f09a0f887b8651bc5aea56f6e2bfa8537 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Mon, 7 Jan 2013 10:33:29 +0100 Subject: [PATCH 2/2] Remove weird date parsing hack to fix tests --- src/view.timeline.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/view.timeline.js b/src/view.timeline.js index d00cb577..a2e85308 100644 --- a/src/view.timeline.js +++ b/src/view.timeline.js @@ -146,11 +146,6 @@ my.Timeline = Backbone.View.extend({ if (out.toDate() == 'Invalid Date') { return null; } 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(); } },