Просмотр исходного кода

Fix momentjs in project list view

James Allen 12 лет назад
Родитель
Сommit
9c20d1d604
2 измененных файлов с 11 добавлено и 4 удалено
  1. 6 0
      services/web/app/views/project/list.jade
  2. 5 4
      services/web/public/coffee/list.coffee

+ 6 - 0
services/web/app/views/project/list.jade

@@ -144,6 +144,12 @@ block content
 		mixin tag('{{ project_id }}', '{{ tagName }}', true)
 
 	- locals.supressDefaultJs = true
+	script
+		window.requirejs = {
+			"paths" : {
+				"moment": "libs/moment"
+			}
+		};
 	script(
 		data-main=jsPath+'list.js?fingerprint='+fingerprint(jsPath + 'list.js'), 
 		baseurl=jsPath,

+ 5 - 4
services/web/public/coffee/list.coffee

@@ -1,16 +1,17 @@
 require [
 	"tags"
+	"moment"
 	"gui"
-	"libs/moment"
 	"libs/underscore"
 	"libs/fineuploader"
 	"libs/jquery.storage"
-], (tagsManager)->
+], (tagsManager, moment)->
 
 	$('.isoDate').each (i, d)->
 		html = $(d)
-		unparsedDate = html.text()
-		formatedDate = moment(unparsedDate).format('LLL')
+		unparsedDate = html.text().trim()
+		console.log unparsedDate
+		formatedDate = moment(unparsedDate).format("Do MMM YYYY, h:mm:ss a")
 		html.text(formatedDate)
 
 	refreshProjectFilter = ->