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

Fix multiple drag and drop in macOS (#1424) 

Related with [TG-5354](https://tree.taiga.io/project/taiga/issue/5354).
stable
Daniel García Barcala 2018-03-08 13:09:56 +01:00 committed by Miguel Gonzalez
parent 6e39de7e67
commit ac199c3b55
6 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,3 +456,17 @@ module.directive 'tgPreloadImage', () ->
preload(src, onLoad) preload(src, onLoad)
} }
#############################################################################
## Disable link href when Ctrl Key is pressed
#############################################################################
CtrlClickDisable = () ->
link = ($scope, $el, $attrs) ->
$el.on "click", ($event) ->
if ($event.ctrlKey || $event.metaKey)
$event.preventDefault()
return {link: link}
module.directive("tgCtrlClickDisable", CtrlClickDisable)

4
app/modules/components/card/card-templates/card-owner.jade
View File

@ -23,7 +23,7 @@
tg-check-permission="{{vm.getPermissionsKey()}}" tg-check-permission="{{vm.getPermissionsKey()}}"
) )
a.e2e-assign.card-owner-assign( a.e2e-assign.card-owner-assign(
ng-click="!$event.ctrlKey && vm.onClickAssignedTo({id: vm.item.get('id')})" ng-click="!$event.ctrlKey && !$event.metaKey && vm.onClickAssignedTo({id: vm.item.get('id')})"
href="" href=""
) )
tg-svg(svg-icon="icon-add-user") tg-svg(svg-icon="icon-add-user")
@ -31,7 +31,7 @@
a.e2e-edit.card-edit( a.e2e-edit.card-edit(
href="" href=""
ng-click="!$event.ctrlKey && vm.onClickEdit({id: vm.item.get('id')})" ng-click="!$event.ctrlKey && !$event.metaKey && vm.onClickEdit({id: vm.item.get('id')})"
tg-loading="vm.item.get('loading')" tg-loading="vm.item.get('loading')"
) )
tg-svg(svg-icon="icon-edit") tg-svg(svg-icon="icon-edit")

3
app/modules/components/card/card-templates/card-title.jade
View File

@ -1,6 +1,7 @@
h2.card-title h2.card-title()
a( a(
href="" href=""
tg-ctrl-click-disable
tg-nav="{{vm.getNavKey()}}:project=vm.project.slug,ref=vm.item.getIn(['model', 'ref'])", tg-nav="{{vm.getNavKey()}}:project=vm.project.slug,ref=vm.item.getIn(['model', 'ref'])",
tg-nav-get-params="{\"kanban-status\": {{vm.item.getIn(['model', 'status'])}}}" tg-nav-get-params="{\"kanban-status\": {{vm.item.getIn(['model', 'status'])}}}"
title="#{{ ::vm.item.getIn(['model', 'ref']) }} {{ vm.item.getIn(['model', 'subject'])}}" title="#{{ ::vm.item.getIn(['model', 'ref']) }} {{ vm.item.getIn(['model', 'subject'])}}"

2
app/modules/components/card/card-templates/card-unfold.jade
View File

@ -1,5 +1,5 @@
.card-unfold.ng-animate-disabled( .card-unfold.ng-animate-disabled(
ng-click="!$event.ctrlKey && vm.toggleFold()" ng-click="!$event.ctrlKey && !$event.metaKey && vm.toggleFold()"
ng-if="vm.visible('unfold') && (vm.hasTasks() || vm.hasVisibleAttachments())" ng-if="vm.visible('unfold') && (vm.hasTasks() || vm.hasVisibleAttachments())"
role="button" role="button"
) )

2
app/modules/components/card/card.scss
View File

@ -3,6 +3,7 @@
cursor: move; cursor: move;
display: block; display: block;
margin: 0 .6rem .6rem; margin: 0 .6rem .6rem;
outline: none;
overflow: hidden; overflow: hidden;
transition: box-shadow .2s ease-in; transition: box-shadow .2s ease-in;
.loading-extra.loading { .loading-extra.loading {
@ -232,6 +233,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
margin: 0; margin: 0;
outline: none;
padding: .25rem; padding: .25rem;
&:hover { &:hover {
background: linear-gradient(to bottom, $white, darken($white, 1%)); background: linear-gradient(to bottom, $white, darken($white, 1%));

2
app/partials/includes/modules/kanban-table.jade
View File

@ -86,7 +86,7 @@ div.kanban-table(
zoom="ctrl.zoom" zoom="ctrl.zoom"
zoom-level="ctrl.zoomLevel" zoom-level="ctrl.zoomLevel"
archived="ctrl.isUsInArchivedHiddenStatus(us.get('id'))" archived="ctrl.isUsInArchivedHiddenStatus(us.get('id'))"
ng-click="$event.ctrlKey && ctrl.toggleSelectedUs(us.get('id'))" ng-click="($event.ctrlKey || $event.metaKey) && ctrl.toggleSelectedUs(us.get('id'))"
) )
div.kanban-column-intro(ng-if="s.is_archived", tg-kanban-archived-status-intro="s") div.kanban-column-intro(ng-if="s.is_archived", tg-kanban-archived-status-intro="s")