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

Fix #1102

stable
David Barragán Merino 2014-09-26 14:05:07 +02:00
parent 480db62423
commit 62ddbe9284
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/coffee/modules/common/history.coffee
View File

@ -440,6 +440,7 @@ HistoryDirective = ($log, $loading) ->
$el.on "click", ".add-comment a.button-green", debounce 2000, (event) -> $el.on "click", ".add-comment a.button-green", debounce 2000, (event) ->
event.preventDefault() event.preventDefault()
$scope.$broadcast("markdown-editor:submit")
target = angular.element(event.currentTarget) target = angular.element(event.currentTarget)

14
app/coffee/modules/common/wisiwyg.coffee
View File

@ -69,8 +69,15 @@ tgMarkitupDirective = ($rootscope, $rs) ->
element = angular.element($el) element = angular.element($el)
previewDomNode = $("<div/>", {class: "preview"}) previewDomNode = $("<div/>", {class: "preview"})
openHelp = -> #openHelp = ->
window.open($rootscope.urls.wikiHelpUrl(), '_blank') # window.open($rootscope.urls.wikiHelpUrl(), '_blank')
closePreviewMode = ->
element.parents(".markdown").find(".preview").remove()
element.parents(".markItUp").show()
$scope.$on "markdown-editor:submit", ->
closePreviewMode()
preview = -> preview = ->
markdownDomNode = element.parents(".markdown") markdownDomNode = element.parents(".markdown")
@ -83,8 +90,7 @@ tgMarkitupDirective = ($rootscope, $rs) ->
# function is better aproach for it # function is better aproach for it
element.parents(".markdown").one "click", ".preview", (event) -> element.parents(".markdown").one "click", ".preview", (event) ->
event.preventDefault() event.preventDefault()
markdownDomNode.find(".preview").remove() closePreviewMode()
markItUpDomNode.show()
markdownCaretPositon = false markdownCaretPositon = false