Merge branch 'master' of https://github.com/wekan/wekan

4 files changed, 0 insertions, 58 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);
diff --git a/client/lib/utils.js b/client/lib/utils.js
index aca45528..f4fc170a 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -10,9 +10,6 @@ Utils = {
       cookies.set('boardView', 'board-view-lists'); //true
     } else if (view === 'board-view-swimlanes') {
       cookies.set('boardView', 'board-view-swimlanes'); //true
-      //} else if (view === 'board-view-collapse') {
-      //  cookies.set('boardView', 'board-view-swimlane'); //true
-      //  cookies.set('collapseSwimlane', 'true'); //true
     } else if (view === 'board-view-cal') {
       cookies.set('boardView', 'board-view-cal'); //true
     }
@@ -32,11 +29,8 @@ Utils = {
         return 'board-view-lists';
       } else if (
         cookies.get('boardView') === 'board-view-swimlanes'
-        //&& !cookies.has('collapseSwimlane')
       ) {
         return 'board-view-swimlanes';
-        //} else if (cookies.has('collapseSwimlane')) {
-        //  return 'board-view-swimlanes';
       } else if (cookies.get('boardView') === 'board-view-cal') {
         return 'board-view-cal';
       } else {