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

Improvements on tagline.

stable
Andrey Antukh 2014-07-02 12:28:14 +02:00
parent b93b0e90eb
commit 311c8a00a2
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/coffee/modules/issues/detail.coffee
View File

@ -108,15 +108,27 @@ module.directive("tgIssueDetail", ["$log", "$tgLocation", IssueDirective])
############################################################################# #############################################################################
TagLineDirective = ($log) -> TagLineDirective = ($log) ->
template = _.template(""" # Main directive template (rendered by angular)
template = """
<div class="tags-container"></div>
<input type="text" placeholder="Write tag..." class="hidden"/>
"""
# Tags template (rendered manually using lodash)
templateTags = _.template("""
<% _.each(tags, function(tag) { %> <% _.each(tags, function(tag) { %>
<span class="tag"><%= tag.name %></span> <div class="tag">
<span class="tag-name"><%- tag.name %></span>
<% if (editable) { %>
<a href="" title="delete tag" class="icon icon-delete"></a>
<% } %>
</div>
<% }); %>""") <% }); %>""")
renderTags = ($el, tags) -> renderTags = ($el, tags, editable) ->
tags = _.map(tags, (t) -> {name: t}) tags = _.map(tags, (t) -> {name: t})
html = template({tags: tags}) html = templateTags({tags: tags, editable:editable})
$el.find("span.tags-container").html(html) $el.find("div.tags-container").html(html)
normalizeTags = (tags) -> normalizeTags = (tags) ->
tags = _.map(tags, trim) tags = _.map(tags, trim)
@ -124,12 +136,13 @@ TagLineDirective = ($log) ->
return _.uniq(tags) return _.uniq(tags)
link = ($scope, $el, $attrs, $model) -> link = ($scope, $el, $attrs, $model) ->
editable = if $attrs.editable == "true" then true else false
$scope.$watch $attrs.ngModel, (val) -> $scope.$watch $attrs.ngModel, (val) ->
return if not val return if not val
renderTags($el, val) renderTags($el, val, editable)
if $attrs.tgTagLine != "editable" $el.find("input").remove() if not editable
$el.find("input").remove()
$el.on "keyup", "input", (event) -> $el.on "keyup", "input", (event) ->
return if event.keyCode != 13 return if event.keyCode != 13
@ -148,6 +161,10 @@ TagLineDirective = ($log) ->
$model.$setViewValue(normalizeTags(tags)) $model.$setViewValue(normalizeTags(tags))
return {link:link, require:"ngModel"} return {
link:link,
require:"ngModel"
template: template
}
module.directive("tgTagLine", ["$log", TagLineDirective]) module.directive("tgTagLine", ["$log", TagLineDirective])

7
app/partials/issues-detail.jade
View File

@ -22,12 +22,7 @@ block content
// p We need Pilar to make a prototype out of this or we are not sure // p We need Pilar to make a prototype out of this or we are not sure
// a.button.button-red.button-block(href="", title="Unblock US") Unblock // a.button.button-red.button-block(href="", title="Unblock US") Unblock
div.user-story-tags(tg-tag-line="editable", ng-model="issue.tags") div.user-story-tags(tg-tag-line editable="true", ng-model="issue.tags")
div.tags-container
div.tag
span.tag-name attachments
a.icon.icon-delete(href="", title="delete tag")
input.hidden(type="text", placeholder="Write tag...")
section.us-content(tg-bind-html="issue.description_html") section.us-content(tg-bind-html="issue.description_html")