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

fix custom-field wysiwyg

stable
Juanfran 2017-03-16 08:35:55 +01:00
parent b2af789412
commit 2b4fac32f4
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/coffee/modules/common/custom-field-values.coffee
View File

@ -150,7 +150,7 @@ module.directive("tgCustomAttributesValues", ["$tgTemplate", "$tgStorage", "$tra
CustomAttributesValuesDirective]) CustomAttributesValuesDirective])
CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate, datePickerConfigService) -> CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate, datePickerConfigService, wysiwygService) ->
template = $template.get("custom-attributes/custom-attribute-value.html", true) template = $template.get("custom-attributes/custom-attribute-value.html", true)
templateEdit = $template.get("custom-attributes/custom-attribute-value-edit.html", true) templateEdit = $template.get("custom-attributes/custom-attribute-value-edit.html", true)
@ -173,9 +173,13 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
type: attributeValue.type type: attributeValue.type
} }
scope = $scope.$new()
scope.attributeHtml = wysiwygService.getHTML(value)
if editable and (edit or not value) if editable and (edit or not value)
html = templateEdit(ctx) html = templateEdit(ctx)
html = $compile(html)($scope)
html = $compile(html)(scope)
$el.html(html) $el.html(html)
if attributeValue.type == DATE_TYPE if attributeValue.type == DATE_TYPE
@ -190,7 +194,7 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
$el.picker = new Pikaday(datePickerConfig) $el.picker = new Pikaday(datePickerConfig)
else else
html = template(ctx) html = template(ctx)
html = $compile(html)($scope) html = $compile(html)(scope)
$el.html(html) $el.html(html)
isEditable = -> isEditable = ->
@ -207,6 +211,8 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
$scope.cancelCustomRichText= () => $scope.cancelCustomRichText= () =>
render(attributeValue, false) render(attributeValue, false)
return null
submit = debounce 2000, (event) => submit = debounce 2000, (event) =>
event.preventDefault() event.preventDefault()
@ -270,4 +276,4 @@ CustomAttributeValueDirective = ($template, $selectedText, $compile, $translate,
} }
module.directive("tgCustomAttributeValue", ["$tgTemplate", "$selectedText", "$compile", "$translate", module.directive("tgCustomAttributeValue", ["$tgTemplate", "$selectedText", "$compile", "$translate",
"tgDatePickerConfigService", CustomAttributeValueDirective]) "tgDatePickerConfigService", "tgWysiwygService", CustomAttributeValueDirective])

2
app/partials/custom-attributes/custom-attribute-value.jade
View File

@ -14,7 +14,7 @@
<%- value %> <%- value %>
<% } else if (type=="richtext") { %> <% } else if (type=="richtext") { %>
.custom-field-value.js-value-view-mode.wysiwyg .custom-field-value.js-value-view-mode.wysiwyg
div(ng-bind-html!="\'<%- value %>\'|markdownToHTML") div(ng-bind-html="attributeHtml")
<% } else { %> <% } else { %>
.custom-field-value.js-value-view-mode .custom-field-value.js-value-view-mode
span span