diff --git a/module/kanban/control.php b/module/kanban/control.php index b04325b0bd..cf1dbca7b1 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -1143,7 +1143,7 @@ class kanban extends control $this->loadModel('action')->create('kanbancard', $cardID, 'importedcard', '', $cards2Imported[$cardID]->kanban); } - return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); + return print(js::locate($this->session->kanbanView, 'parent.parent')); } /* Find Kanban other than this kanban. */ @@ -1190,7 +1190,7 @@ class kanban extends control $this->loadModel('action')->create('kanbancard', $cardID, 'importedProductplan', '', $planID); } - return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); + return print(js::locate($this->session->kanbanView, 'parent.parent')); } $this->loadModel('product'); @@ -1242,7 +1242,7 @@ class kanban extends control $this->loadModel('action')->create('kanbancard', $cardID, 'importedRelease', '', $releaseID); } - return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); + return print(js::locate($this->session->kanbanView, 'parent.parent')); } $this->loadModel('product'); @@ -1291,7 +1291,7 @@ class kanban extends control $this->loadModel('action')->create('kanbancard', $cardID, 'importedBuild', '', $buildID); } - return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); + return print(js::locate($this->session->kanbanView, 'parent.parent')); } $this->loadModel('build'); @@ -1353,7 +1353,7 @@ class kanban extends control $this->loadModel('action')->create('kanbancard', $cardID, 'importedExecution', '', $executionID); } - return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent')); + return print(js::locate($this->session->kanbanView, 'parent.parent')); } $this->loadModel('project'); diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index 095b75c2f1..8b9c832e0c 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1838,13 +1838,12 @@ function swipeRegionNavTabs($object, direction) var $regionNavTabs = $('#regionNavTabs'); var offsetWidth = $regionNavTabs[0].offsetWidth; var objectWidth = $object[0].offsetWidth; - var radius = 0; $object.css('transition-duration', '1s'); $object.find('li').each(function() { - if($(this).hasClass('active') && radius == 0) radius = radiusWidth; + var radius = $(this).hasClass('active') ? radiusWidth : 0; /* Get the offset of the item. */ var itemLeft = $(this)[0].offsetLeft; @@ -1852,10 +1851,10 @@ function swipeRegionNavTabs($object, direction) var itemOffset = itemLeft + itemWidth; /* Calculate the offset after sliding. */ - if(direction == 'left' && (itemOffset + distance + radius) >= 0) + if(direction == 'left' && (itemOffset + distance) >= 0) { /* If you swipe left, the distance is equal to the item's left. */ - distance = - itemLeft - radius; + distance = - itemLeft + radius; if(distance + radius >= 0) { distance = radius; @@ -1868,7 +1867,7 @@ function swipeRegionNavTabs($object, direction) return false; } - if(direction == 'right' && itemOffset > (offsetWidth - distance + radius)) + if(direction == 'right' && itemOffset > (offsetWidth - distance)) { /* If you swipe right, the distance is equal to the left distance of item plus the width of item minus the width of the regionNavTabs. */ distance = offsetWidth - itemOffset - radius;