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

Set maximum dropzone height when the individual column scrolling is disabled

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-21 22:01:52 -05:00
parent 325e72589d
commit 836495b54b
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -9,6 +9,7 @@ New features:
Improvements: Improvements:
* Set maximum dropzone height when the individual column scrolling is disabled
* Always show the search box in board selector * Always show the search box in board selector
* Replace logout link by a dropdown menu * Replace logout link by a dropdown menu
* Handle notification for group members attached to a project * Handle notification for group members attached to a project

2
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

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

@@ -8,12 +8,12 @@ Board.prototype.execute = function() {
this.app.swimlane.refresh(); this.app.swimlane.refresh();
this.restoreColumnViewMode(); this.restoreColumnViewMode();
this.compactView(); this.compactView();
this.columnScrolling();
this.poll(); this.poll();
this.keyboardShortcuts(); this.keyboardShortcuts();
this.listen(); this.listen();
this.dragAndDrop(); this.dragAndDrop();
$(window).on("load", this.columnScrolling);
$(window).resize(this.columnScrolling); $(window).resize(this.columnScrolling);
}; };
@@ -91,12 +91,12 @@ Board.prototype.refresh = function(data) {
this.app.refresh(); this.app.refresh();
this.app.swimlane.refresh(); this.app.swimlane.refresh();
this.columnScrolling();
this.app.hideLoadingIcon(); this.app.hideLoadingIcon();
this.listen(); this.listen();
this.dragAndDrop(); this.dragAndDrop();
this.compactView(); this.compactView();
this.restoreColumnViewMode(); this.restoreColumnViewMode();
this.columnScrolling();
}; };
Board.prototype.dragAndDrop = function() { Board.prototype.dragAndDrop = function() {
@@ -164,21 +164,34 @@ Board.prototype.listen = function() {
}; };
Board.prototype.toggleColumnScrolling = function() { Board.prototype.toggleColumnScrolling = function() {
var scrolling = localStorage.getItem("column_scroll") || 1; var scrolling = localStorage.getItem("column_scroll");
if (scrolling == undefined) {
scrolling = 1;
}
localStorage.setItem("column_scroll", scrolling == 0 ? 1 : 0); localStorage.setItem("column_scroll", scrolling == 0 ? 1 : 0);
this.columnScrolling(); this.columnScrolling();
}; };
Board.prototype.columnScrolling = function() { Board.prototype.columnScrolling = function() {
if (localStorage.getItem("column_scroll") == 0) { if (localStorage.getItem("column_scroll") == 0) {
var height = 80;
$(".filter-max-height").show(); $(".filter-max-height").show();
$(".filter-min-height").hide(); $(".filter-min-height").hide();
$(".board-rotation-wrapper").css("min-height", '');
$(".board-task-list").each(function() { $(".board-task-list").each(function() {
$(this).css("min-height", 80); var columnHeight = $(this).height();
$(this).css("height", '');
$(".board-rotation-wrapper").css("min-height", ''); if (columnHeight > height) {
height = columnHeight;
}
}); });
$(".board-task-list").css("min-height", height);
$(".board-task-list").css("height", '');
} }
else { else {