From 6e39de7e67daa2f07c0f095d61f29b1bd6aebef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Thu, 8 Mar 2018 10:36:25 +0100 Subject: [PATCH 1/4] Repair collapsed column style in Kanban page --- app/styles/modules/kanban/kanban-table.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/styles/modules/kanban/kanban-table.scss b/app/styles/modules/kanban/kanban-table.scss index d08766a4..c997856c 100644 --- a/app/styles/modules/kanban/kanban-table.scss +++ b/app/styles/modules/kanban/kanban-table.scss @@ -33,6 +33,9 @@ $column-padding: .5rem 1rem; opacity: .8; padding: .5rem 0; transition: opacity .3s linear; + .title { + display: none; + } .option:not(.hunfold), span { display: none; From ac199c3b55aa43827c5da6fd8900f3bc7d4955ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Barcala?= Date: Thu, 8 Mar 2018 13:09:56 +0100 Subject: [PATCH 2/4] Fix multiple drag and drop in macOS (#1424) Related with [TG-5354](https://tree.taiga.io/project/taiga/issue/5354). --- app/coffee/modules/common.coffee | 14 ++++++++++++++ .../components/card/card-templates/card-owner.jade | 4 ++-- .../components/card/card-templates/card-title.jade | 3 ++- .../card/card-templates/card-unfold.jade | 2 +- app/modules/components/card/card.scss | 2 ++ app/partials/includes/modules/kanban-table.jade | 2 +- 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/app/coffee/modules/common.coffee b/app/coffee/modules/common.coffee index 16979e26..5641fd80 100644 --- a/app/coffee/modules/common.coffee +++ b/app/coffee/modules/common.coffee @@ -456,3 +456,17 @@ module.directive 'tgPreloadImage', () -> 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) diff --git a/app/modules/components/card/card-templates/card-owner.jade b/app/modules/components/card/card-templates/card-owner.jade index e1b96904..380df5f5 100644 --- a/app/modules/components/card/card-templates/card-owner.jade +++ b/app/modules/components/card/card-templates/card-owner.jade @@ -23,7 +23,7 @@ tg-check-permission="{{vm.getPermissionsKey()}}" ) 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="" ) tg-svg(svg-icon="icon-add-user") @@ -31,7 +31,7 @@ a.e2e-edit.card-edit( 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-svg(svg-icon="icon-edit") diff --git a/app/modules/components/card/card-templates/card-title.jade b/app/modules/components/card/card-templates/card-title.jade index 20868a0b..9f0c4f69 100644 --- a/app/modules/components/card/card-templates/card-title.jade +++ b/app/modules/components/card/card-templates/card-title.jade @@ -1,6 +1,7 @@ -h2.card-title +h2.card-title() a( href="" + tg-ctrl-click-disable 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'])}}}" title="#{{ ::vm.item.getIn(['model', 'ref']) }} {{ vm.item.getIn(['model', 'subject'])}}" diff --git a/app/modules/components/card/card-templates/card-unfold.jade b/app/modules/components/card/card-templates/card-unfold.jade index 9b78e7fa..6f1b4312 100644 --- a/app/modules/components/card/card-templates/card-unfold.jade +++ b/app/modules/components/card/card-templates/card-unfold.jade @@ -1,5 +1,5 @@ .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())" role="button" ) diff --git a/app/modules/components/card/card.scss b/app/modules/components/card/card.scss index 5dfbbe5b..b751ead6 100644 --- a/app/modules/components/card/card.scss +++ b/app/modules/components/card/card.scss @@ -3,6 +3,7 @@ cursor: move; display: block; margin: 0 .6rem .6rem; + outline: none; overflow: hidden; transition: box-shadow .2s ease-in; .loading-extra.loading { @@ -232,6 +233,7 @@ display: flex; justify-content: center; margin: 0; + outline: none; padding: .25rem; &:hover { background: linear-gradient(to bottom, $white, darken($white, 1%)); diff --git a/app/partials/includes/modules/kanban-table.jade b/app/partials/includes/modules/kanban-table.jade index 33bdf42c..f5e39d9b 100644 --- a/app/partials/includes/modules/kanban-table.jade +++ b/app/partials/includes/modules/kanban-table.jade @@ -86,7 +86,7 @@ div.kanban-table( zoom="ctrl.zoom" zoom-level="ctrl.zoomLevel" 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") From 575d0328b413e94e04d6a2b0d61612bbd38c7ec6 Mon Sep 17 00:00:00 2001 From: Miguel Gonzalez Date: Thu, 8 Mar 2018 14:15:05 +0100 Subject: [PATCH 3/4] Update changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2390aacd..edbb99d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog # +## Unreleased + +### Misc +- Fix multiple drag in macOS. +- Repair collapsed column style. + ## 3.2.0 Betula nana (2018-03-07) ### Features From 7fa23564231436fa62f17ea19e938b5e83044721 Mon Sep 17 00:00:00 2001 From: Miguel Gonzalez Date: Thu, 8 Mar 2018 18:00:59 +0100 Subject: [PATCH 4/4] Update version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index edbb99d0..15776b1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog # -## Unreleased +## 3.2.1 (2018-03-08) ### Misc - Fix multiple drag in macOS.