AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not force redirect when clicking on task board link

Browse Source
This commit is contained in:
Frederic Guillot
2015-08-22 22:34:33 -04:00
parent 312dfbb89e
commit b944b44dca
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Template/board/task_private.php
View File

@@ -17,9 +17,7 @@
<?= $this->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?> <?= $this->e($this->user->getInitials($task['assignee_name'] ?: $task['assignee_username'])) ?>
</span> - </span> -
<?php endif ?> <?php endif ?>
<span class="tooltip" title="<?= $this->e($task['title']) ?>" <?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title tooltip', $this->e($task['title'])) ?>
<?= $this->url->link($this->e($task['title']), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-collapsed-title') ?>
</span>
</div> </div>
<?php else: ?> <?php else: ?>
<div class="task-board-expanded"> <div class="task-board-expanded">

2
assets/css/app.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/src/dropdown.css
View File

@@ -12,7 +12,7 @@ ul.dropdown-submenu-open {
position: absolute; position: absolute;
left: 0; left: 0;
z-index: 1000; z-index: 1000;
min-width: 300px; min-width: 280px;
list-style: none; list-style: none;
margin: 3px 0 0 1px; margin: 3px 0 0 1px;
padding: 6px 0; padding: 6px 0;

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

8
assets/js/src/Board.js
View File

@@ -100,7 +100,7 @@ Board.prototype.resizeColumnHeight = function() {
$(this).height(500); $(this).height(500);
} }
else { else {
$(this).css("min-height", 100); $(this).css("min-height", 320); // Min height is the height of the menu dropdown
} }
}); });
} }
@@ -135,8 +135,10 @@ Board.prototype.dragAndDrop = function() {
Board.prototype.listen = function() { Board.prototype.listen = function() {
var self = this; var self = this;
$(document).on("click", ".task-board", function() { $(document).on("click", ".task-board", function(e) {
window.location = $(this).data("task-url"); if (e.target.tagName != "A") {
window.location = $(this).data("task-url");
}
}); });
$(document).on('click', ".filter-toggle-scrolling", function(e) { $(document).on('click', ".filter-toggle-scrolling", function(e) {