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

Fix timeline text binding

stable
Álex Hermida 2018-09-10 17:43:48 +02:00 committed by Alex Hermida
parent 8a835563b6
commit 4c71d0807e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/common/confirm.coffee
View File

@ -61,7 +61,7 @@ class ConfirmService extends taiga.Service
# Render content # Render content
el.find(".title").text(title) if title el.find(".title").text(title) if title
el.find(".subtitle").text(subtitle) if subtitle el.find(".subtitle").text(subtitle) if subtitle
el.find(".message").html(message) if message el.find(".message").text(message) if message
# Assign event handlers # Assign event handlers
el.on "click.confirm-dialog", ".button-green", debounce 2000, (event) => el.on "click.confirm-dialog", ".button-green", debounce 2000, (event) =>

6
app/modules/user-timeline/user-timeline-item/user-timeline-item-title.service.coffee
View File

@ -89,7 +89,7 @@ class UserTimelineItemTitle
else else
new_value = timeline.getIn(["data", "value_diff", "value"]).first().get(1) new_value = timeline.getIn(["data", "value_diff", "value"]).first().get(1)
return _.escape(new_value) return $('<span>').attr('ng-non-bindable', true).text(new_value).prop('outerHTML')
sprint_name: (timeline, event) -> sprint_name: (timeline, event) ->
url = "project-taskboard:project=timeline.getIn(['data', 'project', 'slug']),sprint=timeline.getIn(['data', 'milestone', 'slug'])" url = "project-taskboard:project=timeline.getIn(['data', 'project', 'slug']),sprint=timeline.getIn(['data', 'milestone', 'slug'])"
@ -165,7 +165,6 @@ class UserTimelineItemTitle
return $('<a>') return $('<a>')
.attr('tg-nav', url) .attr('tg-nav', url)
.attr('title', title)
.append(span) .append(span)
.prop('outerHTML') .prop('outerHTML')
@ -186,8 +185,7 @@ class UserTimelineItemTitle
getTitle: (timeline, event, type) -> getTitle: (timeline, event, type) ->
params = @._getParams(timeline, event, type) params = @._getParams(timeline, event, type)
# console.log(timeline)
# console.log(event)
paramsKeys = {} paramsKeys = {}
Object.keys(params).forEach (key) -> paramsKeys[key] = '{{' +key + '}}' Object.keys(params).forEach (key) -> paramsKeys[key] = '{{' +key + '}}'