From 80b01ef636c9a2fbf480061f276b9ffd160eead6 Mon Sep 17 00:00:00 2001 From: jlukic Date: Thu, 7 Nov 2013 12:50:28 -0500 Subject: [PATCH] Fixes #330 issue with nested accordion. Adds nested accordion example --- server/documents/modules/accordion.html.eco | 96 +++++++++++++++++++++ server/files/javascript/semantic.js | 1 - src/modules/accordion.js | 4 +- src/modules/accordion.less | 6 +- 4 files changed, 102 insertions(+), 5 deletions(-) diff --git a/server/documents/modules/accordion.html.eco b/server/documents/modules/accordion.html.eco index f60807ce5..fb07c5ca0 100755 --- a/server/documents/modules/accordion.html.eco +++ b/server/documents/modules/accordion.html.eco @@ -116,6 +116,102 @@ type : 'UI Module'

Examples

+
+

Nested

+

An accordion can have multiple levels of nested content. This content can either be in a nested accordion or simply another level of title and content

+
+
+ + Level 1 +
+
+

Welcome to level 1 where sub content formatted as its own accordion.

+
+
+ + Level 1A +
+
+

Level 1A Contents

+
+
+ + Level 1A-A +
+
+ Level 1A-A Contents +
+
+ + Level 1A-B +
+
+ Level 1A-B Contents +
+
+
+
+ + Level 1B +
+
+ Level 1B Contents +
+
+ + Level 1C +
+
+ Level 1C Contents +
+
+
+
+ + Level 2 +
+
+

Welcome to level 2 where content is formatted without nested accordions

+
+ + Level 2A +
+
+

Level 2A Contents

+
+ + Level 2A-A +
+
+ Level 2A-A Contents +
+
+ + Level 2A-B +
+
+ Level 2A-B Contents +
+
+
+ + Level 2B +
+
+ Level 2B Contents +
+
+ + Level 2C +
+
+ Level 2C Contents +
+
+
+
+ +

Form

An accordion can be used anywhere where content can be shown or hidden. For example, to show optional form fields.

diff --git a/server/files/javascript/semantic.js b/server/files/javascript/semantic.js index ea12d5f41..a06ad93b9 100755 --- a/server/files/javascript/semantic.js +++ b/server/files/javascript/semantic.js @@ -384,7 +384,6 @@ semantic.ready = function() { $visibleStuck = $(this).find('.fixed.column .image, .fixed.column .content'), isInitialized = ($visibleStuck.parent('.sticky-wrapper').size() !== 0) ; - console.log(this); if(!isInitialized) { $visibleStuck .waypoint('sticky', { diff --git a/src/modules/accordion.js b/src/modules/accordion.js index 58d2e6ff8..0aa28d2d8 100755 --- a/src/modules/accordion.js +++ b/src/modules/accordion.js @@ -121,7 +121,7 @@ $.fn.accordion = function(parameters) { var $activeTitle = $title.eq(index), $activeContent = $activeTitle.next($content), - $previousTitle = $title.filter('.' + className.active), + $previousTitle = $activeTitle.siblings(selector.title).filter('.' + className.active), $previousContent = $previousTitle.next($title), contentIsOpen = ($previousTitle.size() > 0) ; @@ -177,7 +177,7 @@ $.fn.accordion = function(parameters) { $activeTitle = $title.eq(index), $activeContent = $activeTitle.next($content) ; - module.debug('Closing accordion content', $activeTitle); + module.debug('Closing accordion content', $activeContent); $activeTitle .removeClass(className.active) ; diff --git a/src/modules/accordion.less b/src/modules/accordion.less index 48c714ca2..88c3d76e1 100755 --- a/src/modules/accordion.less +++ b/src/modules/accordion.less @@ -13,7 +13,8 @@ Accordion *******************************/ -.ui.accordion { +.ui.accordion, +.ui.accordion .accordion { width: 600px; max-width: 100%; overflow: hidden; @@ -193,6 +194,7 @@ Fluid ---------------*/ -.ui.fluid.accordion { +.ui.fluid.accordion, +.ui.fluid.accordion .accordion { width: 100%; } \ No newline at end of file