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

[Backport] prevent wrong call to editableInput in wysiwyg

stable
Juanfran 2017-03-30 08:41:41 +02:00 committed by Jesús Espino
parent ba427c220a
commit 96ec253b99
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/coffee/modules/wiki/main.coffee
View File

@ -255,7 +255,7 @@ $qqueue, $repo, $analytics, wikiHistoryService) ->
return if not value return if not value
$scope.item = value $scope.item = value
$scope.version = value.version $scope.version = value.version
$scope.storageKey = $scope.project.id + "-" + value.id + "-" + $attrs.type $scope.storageKey = $scope.project.id + "-" + value.id + "-wiki"
$scope.$watch 'project', (project) -> $scope.$watch 'project', (project) ->
return if !project return if !project

8
app/modules/components/wysiwyg/wysiwyg.directive.coffee
View File

@ -56,7 +56,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
pre.parentNode.replaceChild(p, pre) pre.parentNode.replaceChild(p, pre)
mediumInstance.checkContentChanged(mediumInstance.elements[0]) mediumInstance.checkContentChanged(mediumInstance.elements[0])
addCodeBlockAndHightlight = (range, elm) -> addCodeBlockAndHightlight = (range, mediumInstance) ->
pre = document.createElement('pre') pre = document.createElement('pre')
code = document.createElement('code') code = document.createElement('code')
@ -73,7 +73,8 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
start.parentNode.insertBefore(pre, start) start.parentNode.insertBefore(pre, start)
refreshCodeBlocks(elm) refreshCodeBlocks(mediumInstance)
mediumInstance.checkContentChanged(mediumInstance.elements[0])
refreshCodeBlocks = (mediumInstance) -> refreshCodeBlocks = (mediumInstance) ->
return if !mediumInstance return if !mediumInstance
@ -104,8 +105,6 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
pre.parentNode.insertBefore(p, pre.nextSibling) pre.parentNode.insertBefore(p, pre.nextSibling)
mediumInstance.checkContentChanged(mediumInstance.elements[0])
AlignRightButton = MediumEditor.extensions.button.extend({ AlignRightButton = MediumEditor.extensions.button.extend({
name: 'rtl', name: 'rtl',
init: () -> init: () ->
@ -297,6 +296,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
discardLocalStorage() discardLocalStorage()
mediumInstance.trigger('blur', {}, editorMedium[0]) mediumInstance.trigger('blur', {}, editorMedium[0])
$scope.outdated = false $scope.outdated = false
refreshCodeBlocks(mediumInstance)
$scope.onCancel() $scope.onCancel()