Merge branch 'master' into stable

app/locales/taiga/locale-en.json

@@ -1105,7 +1105,7 @@
         },
         "REMOVE_RELATIONSHIP_WITH_EPIC": {
             "TITLE": "Remove relationship with Epic",
-            "MESSAGE": "Are you sure you want to delete the relationship of this User Story with the Epic <strong>{{epicSubject}}</strong>?"
+            "MESSAGE": "Are you sure you want to remove the relationship of this User Story with the Epic <strong>{{epicSubject}}</strong>?"
         },
         "CREATE_MEMBER": {
             "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)",

app/modules/components/detail/header/detail-header.controller.coffee

@@ -58,6 +58,10 @@ class StoryHeaderController
             canEdit: _.includes(@.project.my_permissions, @.requiredPerm)
         }
 
+    cancelEdit: () ->
+        @.editMode = false
+        @.item.subject = @.originalSubject
+
     editSubject: (value) ->
         selection = @window.getSelection()
         if selection.type != "Range"

app/modules/components/detail/header/detail-header.jade

@@ -42,7 +42,7 @@
                 svg-icon="icon-save"
             )
         button.edit-title-button.cancel-title-button.e2e-cancel-title-button(
-            ng-click="vm.editSubject(false)"
+            ng-click="vm.cancelEdit(false)"
         )
             tg-svg(svg-icon="icon-close")
 

app/modules/components/wysiwyg/wysiwyg.directive.coffee

@@ -352,7 +352,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
         discardLocalStorage = () ->
             $storage.remove($scope.storageKey)
 
-        cancelWithConfirmation = () ->
+        $scope.cancelWithConfirmation = () ->
             if $scope.content == $scope.markdown
                 $scope.cancel()
 
@@ -509,7 +509,7 @@ Medium = ($translate, $confirm, $storage, wysiwygService, animationFrame, tgLoad
 
                 if $scope.editMode && code == 27
                     e.stopPropagation()
-                    $scope.$applyAsync(cancelWithConfirmation)
+                    $scope.$applyAsync($scope.cancelWithConfirmation)
                 else if code == 27
                     editorMedium.blur()
 

app/partials/common/components/wysiwyg-toolbar.jade

@@ -44,7 +44,7 @@
         tg-svg(svg-icon="icon-save")
     a.e2e-cancel-editor(
         href="#",
-        ng-click="cancel($event)"
+        ng-click="cancelWithConfirmation($event)"
         title="{{ 'COMMON.CANCEL' | translate }}"
     )
         tg-svg(svg-icon="icon-close")