Fixing bugs, improving dates

This commit is contained in:
Will Marshall
2014-04-23 15:46:14 +10:00
parent 16251fe5ea
commit 0479a0a55d
12 changed files with 35 additions and 16 deletions

View File

@@ -13,8 +13,8 @@
#= require ../search/jquery.backstretch.js
#= require angular-backstretch.js
#= require angular-flash.min.js
#= require moment
#
#= require ../shared/jquery.timeago
#= require foundation
#= require ./darkswarm
#= require ./overrides

View File

@@ -1,4 +1,4 @@
window.Darkswarm = angular.module("Darkswarm", ["ngResource", "filters", 'mm.foundation', 'angularLocalStorage', 'pasvaz.bindonce', 'infinite-scroll', 'angular-flash.service', 'backstretch']).config ($httpProvider, $tooltipProvider) ->
window.Darkswarm = angular.module("Darkswarm", ["ngResource", 'mm.foundation', 'angularLocalStorage', 'pasvaz.bindonce', 'infinite-scroll', 'angular-flash.service', 'backstretch']).config ($httpProvider, $tooltipProvider) ->
$httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
$httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
$httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'

View File

@@ -0,0 +1,10 @@
Darkswarm.filter "date_in_words", ->
(date) ->
moment(date).fromNow()
Darkswarm.filter "sensible_timeframe", (date_in_wordsFilter)->
(date) ->
if moment().add('days', 2) < moment(date)
"Orders open"
else
"Closing in #{date_in_wordsFilter(date)}"

View File

@@ -1,4 +1,4 @@
angular.module("filters", []).filter "truncate", ->
Darkswarm.filter "truncate", ->
(text, length, end) ->
text = text || ""
length = 10 if isNaN(length)
@@ -7,8 +7,3 @@ angular.module("filters", []).filter "truncate", ->
text
else
String(text).substring(0, length - end.length) + end
$.timeago.settings.allowFuture = true;
angular.module("filters").filter "date_in_words", ->
(date) ->
$.timeago(date)