taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some comments

stable
David Barragán Merino 2014-09-04 10:23:09 +02:00
parent 89de60dad3
commit dbce8d722a
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/coffee/modules/common.coffee
View File

@ -115,7 +115,6 @@ module.directive("tgTagLine", ["$log", TagLineDirective])
############################################################################# #############################################################################
ChangesDirective = -> ChangesDirective = ->
# TODO: i18n
containerTemplate = _.template(""" containerTemplate = _.template("""
<div> <div>
<% if (showMoreEnabled){ %> <% if (showMoreEnabled){ %>
@ -124,7 +123,7 @@ ChangesDirective = ->
</a> </a>
<% } %> <% } %>
</div> </div>
""") """) # TODO: i18n
commentBaseTemplate = _.template(""" commentBaseTemplate = _.template("""
<div class="entry comment-single <% if(hidden){ %>hidden<% }%>"> <div class="entry comment-single <% if(hidden){ %>hidden<% }%>">
<div class="comment-user activity-comment"> <div class="comment-user activity-comment">
@ -195,7 +194,7 @@ ChangesDirective = ->
</p> </p>
</div> </div>
</div> </div>
""") """) # TODO: i18n
descriptionChangeTemplate = _.template(""" descriptionChangeTemplate = _.template("""
<div class="activity-inner"> <div class="activity-inner">
<div class="activity-changed"> <div class="activity-changed">
@ -226,7 +225,7 @@ ChangesDirective = ->
</div> </div>
</div> </div>
<% }); %> <% }); %>
""") """) # TODO: i18n
attachmentTemplate = _.template(""" attachmentTemplate = _.template("""
<div class="activity-inner"> <div class="activity-inner">
<div class="activity-changed"> <div class="activity-changed">
@ -244,10 +243,9 @@ ChangesDirective = ->
buildChangesText = (comment) -> buildChangesText = (comment) ->
size = countChanges(comment) size = countChanges(comment)
# TODO: i18n
if size == 1 if size == 1
return "Made #{size} change" return "Made #{size} change" # TODO: i18n
return "Made #{size} changes" return "Made #{size} changes" # TODO: i18n
renderEntries = (change, parentDomNode) -> renderEntries = (change, parentDomNode) ->
_.each change.values_diff, (modification, name) -> _.each change.values_diff, (modification, name) ->
@ -265,10 +263,10 @@ ChangesDirective = ->
if attachmentType == "new" if attachmentType == "new"
_.each attachmentChanges, (attachmentChange) -> _.each attachmentChanges, (attachmentChange) ->
parentDomNode.append(attachmentTemplate({ parentDomNode.append(attachmentTemplate({
name: "New attachment" name: "New attachment" # TODO: i18n
description: attachmentChange.filename description: attachmentChange.filename
})) }))
else if attachmentType == "deleted" else if attachmentType == "deleted" # TODO: i18n
_.each attachmentChanges, (attachmentChange) -> _.each attachmentChanges, (attachmentChange) ->
parentDomNode.append(attachmentTemplate({ parentDomNode.append(attachmentTemplate({
name: "Deleted attachment" name: "Deleted attachment"
@ -278,10 +276,15 @@ ChangesDirective = ->
name = "Updated attachment" name = "Updated attachment"
_.each attachmentChanges, (attachmentChange) -> _.each attachmentChanges, (attachmentChange) ->
parentDomNode.append(attachmentTemplate({ parentDomNode.append(attachmentTemplate({
name: "Updated attachment" name: "Updated attachment" # TODO: i18n
description: attachmentChange[0].filename description: attachmentChange[0].filename
})) }))
else if name == "assigned_to"
parentDomNode.append(standardChangeFromToTemplate({
name: name
from: prettyPrintModification(modification[0]) ? "Unassigned" # TODO: i18n
to: prettyPrintModification(modification[1]) ? "Unassigned" # TODO: i18n
}))
else else
parentDomNode.append(standardChangeFromToTemplate({ parentDomNode.append(standardChangeFromToTemplate({
name: name name: name
@ -302,7 +305,6 @@ ChangesDirective = ->
entryDomNode = $(html) entryDomNode = $(html)
activityContentDom = entryDomNode.find(".comment-content .us-activity") activityContentDom = entryDomNode.find(".comment-content .us-activity")
renderEntries(comment, activityContentDom) renderEntries(comment, activityContentDom)
console.log entryDomNode.html()
containerDomNode.append(entryDomNode) containerDomNode.append(entryDomNode)
renderChange = (change, containerDomNode, hidden) -> renderChange = (change, containerDomNode, hidden) ->
@ -328,12 +330,12 @@ ChangesDirective = ->
if typeIsArray(value) if typeIsArray(value)
if value.length == 0 if value.length == 0
#TODO i18n #TODO i18n
return "None" return "None" # TODO: i18n
return value.join(", ") return value.join(", ")
if value == "" if value == ""
#TODO i18n #TODO i18n
return "None" return "None" # TODO: i18n
return value return value