From 4c71d0807eea4efc9a0c9f0bc84fff962f765338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Mon, 10 Sep 2018 17:43:48 +0200 Subject: [PATCH] Fix timeline text binding --- app/coffee/modules/common/confirm.coffee | 2 +- .../user-timeline-item-title.service.coffee | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/coffee/modules/common/confirm.coffee b/app/coffee/modules/common/confirm.coffee index 6e7cc556..e15c5e01 100644 --- a/app/coffee/modules/common/confirm.coffee +++ b/app/coffee/modules/common/confirm.coffee @@ -61,7 +61,7 @@ class ConfirmService extends taiga.Service # Render content el.find(".title").text(title) if title el.find(".subtitle").text(subtitle) if subtitle - el.find(".message").html(message) if message + el.find(".message").text(message) if message # Assign event handlers el.on "click.confirm-dialog", ".button-green", debounce 2000, (event) => diff --git a/app/modules/user-timeline/user-timeline-item/user-timeline-item-title.service.coffee b/app/modules/user-timeline/user-timeline-item/user-timeline-item-title.service.coffee index b4f00877..d7999e3d 100644 --- a/app/modules/user-timeline/user-timeline-item/user-timeline-item-title.service.coffee +++ b/app/modules/user-timeline/user-timeline-item/user-timeline-item-title.service.coffee @@ -89,7 +89,7 @@ class UserTimelineItemTitle else new_value = timeline.getIn(["data", "value_diff", "value"]).first().get(1) - return _.escape(new_value) + return $('').attr('ng-non-bindable', true).text(new_value).prop('outerHTML') sprint_name: (timeline, event) -> url = "project-taskboard:project=timeline.getIn(['data', 'project', 'slug']),sprint=timeline.getIn(['data', 'milestone', 'slug'])" @@ -165,7 +165,6 @@ class UserTimelineItemTitle return $('') .attr('tg-nav', url) - .attr('title', title) .append(span) .prop('outerHTML') @@ -186,8 +185,7 @@ class UserTimelineItemTitle getTitle: (timeline, event, type) -> params = @._getParams(timeline, event, type) - # console.log(timeline) - # console.log(event) + paramsKeys = {} Object.keys(params).forEach (key) -> paramsKeys[key] = '{{' +key + '}}'