Merge branch 'master' into stable

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog #
 
+## 3.2.1 (2018-03-08)
+
+### Misc
+- Fix multiple drag in macOS.
+- Repair collapsed column style.
+
 ## 3.2.0 Betula nana (2018-03-07)
 
 ### Features

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)

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")

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'])}}"

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"
 )

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%));

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")

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;