Merge branch 'master' into tizen_2.2

Change-Id: I4c152ad4eab8af4ed65a4cdbb77f85992394796d

diff --git a/widgets/list/list-collapsible.html b/widgets/list/list-collapsible.html
index 7cea274..231ae9d 100644 (file)
--- a/widgets/list/list-collapsible.html
+++ b/widgets/list/list-collapsible.html
@@ -3,41 +3,56 @@
                <h1>Collapsible list (JQM)</h1>
        </div>
        <div data-role="content">
-               <form>
                <ul data-role="listview">
+                       <li data-style="dialogue">1line</li>
+               </ul>
+               <div data-role="collapsible" data-inset="false">
+                       <h6>1line</h6>
+                       <ul data-role="listview">
+                               <li data-style="dialogue">2line</li>
+                       </ul>
+               </div>
+               <div data-role="collapsible" data-inset="false">
+                       <h6>1line</h6>
+                       <ul data-role="listview">
+                               <li data-style="dialogue">exp1-sub 1</li>
+                               <li data-style="dialogue">exp1-sub 2</li>
+                               <li data-style="dialogue">exp1-sub 3</li>
+                               <li data-style="dialogue">exp1-sub 4</li>
+                               <li data-style="dialogue">exp1-sub 5</li>
+                       </ul>
                        <div data-role="collapsible" data-inset="false">
-                               <li class="ui-li-dialogue">1line</li>
-                               <li class="ui-li-dialogue">exp1-sub 1</li>
-                               <li class="ui-li-dialogue">exp1-sub 2</li>
-                               <li class="ui-li-dialogue">exp1-sub 3</li>
-                               <li class="ui-li-dialogue">exp1-sub 4</li>
-                               <li class="ui-li-dialogue">exp1-sub 5</li>
+                               <h6>exp1-sub 2 (exp2)</h6>
+                               <ul data-role="listview">
+                                       <li data-style="dialogue">exp2-sub 1</li>
+                                       <li data-style="dialogue">exp2-sub 2</li>
+                               </ul>
                                <div data-role="collapsible" data-inset="false">
-                                       <li class="ui-li-dialogue">exp1-sub 2 (exp2)</li>
-                                       <li class="ui-li-dialogue">exp2-sub 1</li>
-                                       <li class="ui-li-dialogue">exp2-sub 2</li>
-                                       <div data-role="collapsible" data-inset="false">
-                                       <li class="ui-li-dialogue">exp2-sub 3</li>
-                                       <li class="ui-li-dialogue">
-                                               <span class="ui-li-text-main">2line</span>
-                                               <span class="ui-li-text-sub">Subtext</span>
-                                       </li>
-                                       </div>
+                                       <h6>exp2-sub 3</h6>
+                                       <ul data-role="listview">
+                                               <li data-style="dialogue">
+                                                       <span class="ui-li-text-main">2line</span>
+                                                       <span class="ui-li-text-sub">Subtext</span>
+                                               </li>
+                                       </ul>
                                </div>
+                               
                        </div>
-                       <li class="ui-li-dialogue">level 1</li>
-                       <li class="ui-li-dialogue" data-expandable="true" id="exp4">
+               </div>
+               <ul data-role="listview">
+                       <li data-style="dialogue">level 1</li>
+                       <li data-style="expandable" id="exp4">
                                <span class="ui-li-text-main">2line-sub-main</span>
                                <span class="ui-li-text-sub">Subtext</span>
                        </li>
-                       <li class="ui-li-has-radio ui-li-dialogue" data-expandable="true" id="exp5">
+                       <li class="ui-li-has-radio" data-style="expandable" id="exp5">
                                <form>
-                               <input type="radio" name="collapsible-radio" />
-                               <span class="ui-li-text-main">2line-radio1</span>
-                               <span class="ui-li-text-sub">Subtext</span>
+                                       <input type="radio" name="collapsible-radio" />
+                                       <span class="ui-li-text-main">2line-radio1</span>
+                                       <span class="ui-li-text-sub">Subtext</span>
                                </form>
                        </li>
-                       <li class="ui-li-dialogue" data-expandable="true" id="exp6">
+                       <li data-style="data-expandable" id="exp6">
                                <span class="ui-li-color-bar" style="background-color:rgba(72, 136, 42, 1);"></span>
                                <span class="ui-li-text-main">2line-colorbar3</span>
                                <span class="ui-li-text-sub">Subtext</span>
@@ -45,7 +60,6 @@
                                <img src="thumbnail.jpg" alt="icon" class="ui-li-bigicon">
                        </li>
                </ul>
-               </form>
        </div>
        <script>
        $( "#genlist-expandable" ).on( "pageshow" , function() {