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

Merge branch 'master' into stable

stable
Álex Hermida 2018-08-20 18:08:44 +02:00
parent 0376c3d4d5 583cb5b5d1
commit b3cf6e13db
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/locales/taiga/locale-en.json
View File

@ -1105,7 +1105,7 @@
}, },
"REMOVE_RELATIONSHIP_WITH_EPIC": { "REMOVE_RELATIONSHIP_WITH_EPIC": {
"TITLE": "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": { "CREATE_MEMBER": {
"PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)", "PLACEHOLDER_INVITATION_TEXT": "(Optional) Add a personalized text to the invitation. Tell something lovely to your new members ;-)",

4
app/modules/components/detail/header/detail-header.controller.coffee
View File

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

2
app/modules/components/detail/header/detail-header.jade
View File

@ -42,7 +42,7 @@
svg-icon="icon-save" svg-icon="icon-save"
) )
button.edit-title-button.cancel-title-button.e2e-cancel-title-button( 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") tg-svg(svg-icon="icon-close")

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

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

2
app/partials/common/components/wysiwyg-toolbar.jade
View File

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