Browse Source

Fixes #330 issue with nested accordion. Adds nested accordion example

beta
jlukic 11 years ago
parent
commit
80b01ef636
  1. 96
      server/documents/modules/accordion.html.eco
  2. 1
      server/files/javascript/semantic.js
  3. 4
      src/modules/accordion.js
  4. 6
      src/modules/accordion.less

96
server/documents/modules/accordion.html.eco

@ -116,6 +116,102 @@ type : 'UI Module'
<h2 class="ui dividing header">Examples</h2>
<div class="example">
<h3 class="ui header">Nested</h3>
<p>An accordion can have multiple levels of nested content. This content can either be in a nested <code>accordion</code> or simply another level of <code>title</code> and <code>content</code></p>
<div class="ui accordion">
<div class="active title">
<i class="dropdown icon"></i>
Level 1
</div>
<div class="active content">
<p>Welcome to level 1 where sub content formatted as its own accordion.</p>
<div class="accordion">
<div class="active title">
<i class="dropdown icon"></i>
Level 1A
</div>
<div class="active content">
<p>Level 1A Contents</p>
<div class="accordion">
<div class="title">
<i class="dropdown icon"></i>
Level 1A-A
</div>
<div class="content">
Level 1A-A Contents
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 1A-B
</div>
<div class="content">
Level 1A-B Contents
</div>
</div>
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 1B
</div>
<div class="content">
Level 1B Contents
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 1C
</div>
<div class="content">
Level 1C Contents
</div>
</div>
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 2
</div>
<div class="content">
<p>Welcome to level 2 where content is formatted without nested accordions</p>
<div class="active title">
<i class="dropdown icon"></i>
Level 2A
</div>
<div class="active content">
<p>Level 2A Contents</p>
<div class="title">
<i class="dropdown icon"></i>
Level 2A-A
</div>
<div class="content">
Level 2A-A Contents
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 2A-B
</div>
<div class="content">
Level 2A-B Contents
</div>
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 2B
</div>
<div class="content">
Level 2B Contents
</div>
<div class="title">
<i class="dropdown icon"></i>
Level 2C
</div>
<div class="content">
Level 2C Contents
</div>
</div>
</div>
</div>
</div>
<div class="example">
<h3 class="ui header">Form</h3>
<p>An accordion can be used anywhere where content can be shown or hidden. For example, to show optional form fields.</p>

1
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', {

4
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)
;

6
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%;
}
Loading…
Cancel
Save