mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-04-04 07:09:14 +00:00
Fixing bugs, improving dates
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
10
app/assets/javascripts/darkswarm/filters/dates.js.coffee
Normal file
10
app/assets/javascripts/darkswarm/filters/dates.js.coffee
Normal 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)}"
|
||||
@@ -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)
|
||||
Reference in New Issue
Block a user