summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorGuillaume <gcassou@sii.fr>2019-11-29 14:57:33 +0100
committerGuillaume <gcassou@sii.fr>2019-11-29 14:57:33 +0100
commitc77979ff134b91fa6c7226520c1463a62ea2eac0 (patch)
tree96deafbb9f816784ec1c9e45bb4cd37b2d22af70 /client/components
parent0a1e7006b38979fe40653834aa037341c6ac3355 (diff)
parentd5a8ec1c36fb4810746eaf44aac3ef66d8df77e2 (diff)
downloadwekan-c77979ff134b91fa6c7226520c1463a62ea2eac0.tar.gz
wekan-c77979ff134b91fa6c7226520c1463a62ea2eac0.tar.bz2
wekan-c77979ff134b91fa6c7226520c1463a62ea2eac0.zip
Merge branch 'master' of https://github.com/wekan/wekan
Diffstat (limited to 'client/components')
-rw-r--r--client/components/boards/boardHeader.jade12
-rw-r--r--client/components/swimlanes/swimlanes.jade22
-rw-r--r--client/components/swimlanes/swimlanes.js18
3 files changed, 0 insertions, 52 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 39221778..53a74f76 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -103,14 +103,9 @@ template(name="boardHeaderBar")
i.fa.fa-trello
if $eq boardView 'board-view-swimlanes'
i.fa.fa-th-large
- // unless collapseSwimlane
- // i.fa.fa-th-large
- // if collapseSwimlane
- // i.fa.fa-play
if $eq boardView 'board-view-cal'
i.fa.fa-calendar
span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
- //span {{#if collapseSwimlane}}{{_ 'board-view-collapse'}}{{else}}{{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}{{/if}}
if canModifyBoard
a.board-header-btn.js-multiselection-activate(
@@ -191,13 +186,6 @@ template(name="boardChangeViewPopup")
| {{_ 'board-view-swimlanes'}}
if $eq Utils.boardView "board-view-swimlanes"
i.fa.fa-check
- //li
- // with "board-view-collapse"
- // a.js-open-collapse-view
- // i.fa.fa-play.colorful
- // | {{_ 'board-view-collapse'}}
- // if $eq Utils.boardView "board-view-collapse"
- // i.fa.fa-check
li
with "board-view-cal"
a.js-open-cal-view
diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade
index b2e03afe..1dc23c59 100644
--- a/client/components/swimlanes/swimlanes.jade
+++ b/client/components/swimlanes/swimlanes.jade
@@ -20,28 +20,6 @@ template(name="swimlane")
if currentUser.isBoardMember
unless currentUser.isCommentOnly
+addListForm
- //if collapseSwimlane
- // // Minimize swimlanes next 2 lines below https://www.w3schools.com/howto/howto_js_accordion.asp
- // button(class="accordion")
- // div(class="panel")
- // .swimlane.js-lists.js-swimlane
- // if isMiniScreen
- // if currentListIsInThisSwimlane _id
- // +list(currentList)
- // unless currentList
- // each lists
- // +miniList(this)
- // if currentUser.isBoardMember
- // unless currentUser.isCommentOnly
- // +addListForm
- // else
- // each lists
- // +list(this)
- // if currentCardIsInThisList _id ../_id
- // +cardDetails(currentCard)
- // if currentUser.isBoardMember
- // unless currentUser.isCommentOnly
- // +addListForm
template(name="listsGroup")
.swimlane.list-group.js-lists
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 8687a0e8..d072a2a2 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -146,24 +146,6 @@ BlazeComponent.extendComponent({
}
initSortable(boardComponent, $listsDom);
-
- if (cookies.has('collapseSwimlane')) {
- // Minimize swimlanes start https://www.w3schools.com/howto/howto_js_accordion.asp
- const acc = document.getElementsByClassName('accordion');
- let i;
- for (i = 0; i < acc.length; i++) {
- acc[i].addEventListener('click', function() {
- this.classList.toggle('active');
- const panel = this.nextElementSibling;
- if (panel.style.maxHeight) {
- panel.style.maxHeight = null;
- } else {
- panel.style.maxHeight = `${panel.scrollHeight}px`;
- }
- });
- }
- // Minimize swimlanes end https://www.w3schools.com/howto/howto_js_accordion.asp
- }
},
onCreated() {
this.draggingActive = new ReactiveVar(false);