From 57f7e04f4450bd9d6b8b6c15f05ced461e7c1abc Mon Sep 17 00:00:00 2001 From: Quincy Larson Date: Sat, 16 Jan 2016 01:21:05 -0800 Subject: [PATCH] start working on accordion caret animation --- client/main.js | 13 +++++++------ server/views/map/show.jade | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/client/main.js b/client/main.js index a9b5ff0cf46..a30e86c592b 100644 --- a/client/main.js +++ b/client/main.js @@ -278,12 +278,13 @@ $(document).ready(function() { $('.map-aside').addClass('is-collapsed'); }); - $('.collapse').on('show.bs.collapse', function(){ - console.log(this); - $(this).siblings().find(".fa-caret-right").removeClass("fa-caret-right").addClass("fa-caret-down"); - }).on('hide.bs.collapse', function(){ - $(this).siblings().find(".fa-caret-down").removeClass("fa-caret-down").addClass("fa-caret-right"); - }); + // I am going crazy trying to get this to work. Any takers? + // $('.collapse').on('show.bs.collapse', function(){ + // console.log(this); + // $(this).sibling().eq(0).find(".fa-caret-right").removeClass("fa-caret-right").addClass("fa-caret-down"); + // }).on('hide.bs.collapse', function(){ + // $(this).sibling().eq(0).find(".fa-caret-down").removeClass("fa-caret-down").addClass("fa-caret-right"); + // }); $('#showAll').on('click', () => { var mapExpanded = $('#showAll').hasClass('active'); diff --git a/server/views/map/show.jade b/server/views/map/show.jade index 16eeff380ce..54b0b2b8535 100644 --- a/server/views/map/show.jade +++ b/server/views/map/show.jade @@ -20,9 +20,10 @@ block content #nested for challengeBlock in superBlock.blocks h3 + i.fa.fa-caret-right + |   a(data-toggle='collapse', data-parent='#nested', href='#nested-collapse'+challengeBlock.name.replace(/(\W)/gi, '').split(' ').join('-')) - i.fa.fa-caret-right - |   + |   | #{challengeBlock.name} (#{challengeBlock.time}) div.margin-left-10(id = "nested-collapse"+challengeBlock.name.replace(/\W/gi, '').split(' ').join('-') class = "collapse map-collapse no-transition")