Fixed collapse internal divs in accordion

olton · olton · commit c69da52edce5 · 2012-12-09T12:26:04.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.15.8.9
+
+Fixed collapse internal div's in accordion
+
 ## 0.15.8.8
 
 Disable IE10 native clear and reveal buttons in input[text, password]
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ x.x.x.x
 
 # Current Version
 
-## 0.15.8.8
+## 0.15.8.9
 
 See details of definition on [metroui.org.ua](http://metroui.org.ua)
 
diff --git a/javascript/accordion.js b/javascript/accordion.js
@@ -6,14 +6,14 @@
         var $this = $(this)
             , $li = $this.children("li")
             , $triggers = $li.children("a")
-            , $frames = $this.find("li div")
+            , $frames = $li.children("div")
             ;
 
         var initTriggers = function(triggers){
             triggers.on('click', function(e){
                 e.preventDefault();
                 var $a = $(this)
-                  , target = $($a.parent('li').children("div"));
+                  , target = $a.parent('li').children("div");
 
                 if ( $a.parent('li').hasClass('active') ) {
                     target.slideUp();
diff --git a/less/forms.less b/less/forms.less
@@ -345,7 +345,6 @@
                 font-size: 12pt;
                 position: absolute;
                 #font > .normal;
-                display: inline-block;
             }
 
 
@@ -356,7 +355,6 @@
             &:active {
                 background-color: #000;
 
-
                 &:before {
                     color: #fff;
                 }
diff --git a/public/accordion.php b/public/accordion.php
@@ -18,13 +18,19 @@
                         <div>
                             <h3>frame 1</h3>
                             Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur porta condimentum sem sed commodo.
+                            <p>
+                                subcontent 1
+                            </p>
                         </div>
                     </li>
                     <li class="active">
                         <a href="#">frame 2</a>
                         <div>
                             <h3>frame 2</h3>
                             Curabitur porta condimentum sem sed commodo. Praesent vestibulum, libero eget lacinia pretium, metus augue dapibus odio, nec placerat mauris justo non ante.
+                            <div>
+                                subcontent 2
+                            </div>
                         </div>
                     </li>
                     <li>
diff --git a/public/css/modern.css b/public/css/modern.css
@@ -5169,6 +5169,8 @@ table.bordered tbody tr:last-child td {
   letter-spacing: 0.02em;
   line-height: 20px;
   display: inline-block;
+  height: 100%;
+  width: 100%;
 }
 .input-control.text .helper:hover,
 .input-control.password .helper:hover {
diff --git a/public/js/modern/accordion.js b/public/js/modern/accordion.js
@@ -6,14 +6,14 @@
         var $this = $(this)
             , $li = $this.children("li")
             , $triggers = $li.children("a")
-            , $frames = $this.find("li div")
+            , $frames = $li.children("div")
             ;
 
         var initTriggers = function(triggers){
             triggers.on('click', function(e){
                 e.preventDefault();
                 var $a = $(this)
-                  , target = $($a.parent('li').children("div"));
+                  , target = $a.parent('li').children("div");
 
                 if ( $a.parent('li').hasClass('active') ) {
                     target.slideUp();
diff --git a/public/version.phtml b/public/version.phtml
@@ -1,3 +1,3 @@
 <?php
 
-return "0.15.8.8";
+return "0.15.8.9";
diff --git a/public/windows8start.php b/public/windows8start.php
@@ -45,10 +45,11 @@ function Resize(){
         function AddMouseWheel(){
             $("body").mousewheel(function(event, delta){
                 var scroll_value = delta * 50;
-                if (!jQuery.browser.chrome) {
-                    document.documentElement.scrollLeft -= scroll_value;
-                } else {
+                if (jQuery.browser.webkit) {
                     this.scrollLeft -= scroll_value;
+
+                } else {
+                    document.documentElement.scrollLeft -= scroll_value;
                 }
                 return false;
             });

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,6 @@`
`345`	`345`	`font-size: 12pt;`
`346`	`346`	`position: absolute;`
`347`	`347`	`#font > .normal;`
`348`		`- display: inline-block;`
`349`	`348`	`}`
`350`	`349`
`351`	`350`
`@@ -356,7 +355,6 @@`
`356`	`355`	`&:active {`
`357`	`356`	`background-color: #000;`
`358`	`357`
`359`		`-`
`360`	`358`	`&:before {`
`361`	`359`	`color: #fff;`
`362`	`360`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5169,6 +5169,8 @@ table.bordered tbody tr:last-child td {`
`5169`	`5169`	`letter-spacing: 0.02em;`
`5170`	`5170`	`line-height: 20px;`
`5171`	`5171`	`display: inline-block;`
	`5172`	`+ height: 100%;`
	`5173`	`+ width: 100%;`
`5172`	`5174`	`}`
`5173`	`5175`	`.input-control.text .helper:hover,`
`5174`	`5176`	`.input-control.password .helper:hover {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-return "0.15.8.8";`
	`3`	`+return "0.15.8.9";`