From 8d9b36c0a6fda248d6833b3d002621dcbcb6019e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Wed, 6 Mar 2013 14:43:13 +0100 Subject: [PATCH] Remove Date hack, which was used for timeago --- assets/scripts/app/helpers/helpers.coffee | 2 +- assets/scripts/spec/spec_helper.coffee | 8 ++++---- assets/scripts/travis.coffee | 3 +++ assets/scripts/vendor/jquery.timeago.js | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee index f3decb63..a0f28ec5 100644 --- a/assets/scripts/app/helpers/helpers.coffee +++ b/assets/scripts/app/helpers/helpers.coffee @@ -73,7 +73,7 @@ require 'config/emoij' string _nowUtc: -> - @_toUtc new Date() + @_toUtc Travis.currentDate() _toUtc: (date) -> Date.UTC date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds() diff --git a/assets/scripts/spec/spec_helper.coffee b/assets/scripts/spec/spec_helper.coffee index 03ed3945..de1a3688 100644 --- a/assets/scripts/spec/spec_helper.coffee +++ b/assets/scripts/spec/spec_helper.coffee @@ -10,10 +10,10 @@ minispade.require 'app' url = "/#{url}" unless url.match /^\// Travis.__container__.lookup('router:main').handleURL(url) -_Date = Date -@Date = (date) -> - new _Date(date || '2012-07-02T00:03:00Z') -@Date.UTC = _Date.UTC + +now = -> new Date('2012-07-02T00:03:00Z') +$.timeago.settings.nowFunction = -> now().getTime() +Travis.currentDate = now # hacks for missing features in webkit unless Function::bind diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 21253131..5d43dac5 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -77,6 +77,9 @@ window.Travis = Em.Application.extend(Ember.Evented, location.href = location.href.replace('#!/', '') if location.hash.slice(0, 2) == '#!' I18n.fallbacks = true @setLocale 'locale', @get('defaultLocale') + + currentDate: -> + new Date() ).create() Travis.deferReadiness() diff --git a/assets/scripts/vendor/jquery.timeago.js b/assets/scripts/vendor/jquery.timeago.js index 9b7c93a5..22c06133 100644 --- a/assets/scripts/vendor/jquery.timeago.js +++ b/assets/scripts/vendor/jquery.timeago.js @@ -41,7 +41,8 @@ months: '%d months', year: 'about a year', years: '%d years', - numbers: [] + numbers: [], + nowFunction: function() { return new Date().getTime(); } } }, distanceInWords: function(date) { @@ -95,7 +96,7 @@ return (this.now() - date.getTime()); }, now: function() { - return new Date().getTime(); + return this.settings.nowFunction.call(this); }, parse: function(iso8601) { var s = $.trim(iso8601);