sync to 0.2.37

Change-Id: Ia1c1fedb43c18c25e9011b5059bbd80111bcf278

diff --git a/index.html b/index.html
index 7d0c9b5..23a8fa5 100644 (file)
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
        <script src="configure.js"></script>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
        <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw.min.js"
-               data-framework-theme="tizen-white"
+               data-framework-theme="tizen-black"
                data-framework-viewport-width="device-width">
 
        </script>

diff --git a/main.js b/main.js
index 70dd50b..b9a276c 100644 (file)
--- a/main.js
+++ b/main.js
@@ -1,3 +1,24 @@
 $( document ).on( "pageinit", function () {
        $.mobile.tizen.enableSelection( $("div:jqmData(role='page')"), 'none' );
 });
+
+
+$( document ).on( "pageshow", function () {
+        var $elFooter = $( ".ui-page-active .ui-footer" ),
+                $elBackKey = $elFooter.children( ".ui-btn-back" ),
+                $elMoreKey = $elFooter.children(":jqmData(icon='naviframe-more')"),
+                cntMore = 0;
+
+       if ( !($.tizen && $.tizen.frameworkData.deviceCapa && $.tizen.frameworkData.deviceCapa.inputKeyBack) ) {
+               return true;
+       }
+
+       if ( $elMoreKey.length ) {
+               cntMore = $elMoreKey.length + 1;
+        }
+
+        if ( $elFooter.children().length - $elBackKey.length - cntMore === 0 ) {
+               $elFooter.hide();
+                $( ".ui-page-active" ).page("refresh");
+        }
+});

diff --git a/tips/generate-elements-dynamically/generate-elements-dynamically.html b/tips/generate-elements-dynamically/generate-elements-dynamically.html
index 5baa395..cc90cec 100644 (file)
--- a/tips/generate-elements-dynamically/generate-elements-dynamically.html
+++ b/tips/generate-elements-dynamically/generate-elements-dynamically.html
@@ -33,9 +33,9 @@
                                        $( "#checkboxItems" ).append( newhtml).trigger( "create" );<br>
                                </p>
                        </div>
-
+       
                        <div id="checkboxItems" ></div>
-
+       
                        <fieldset class="ui-grid-b">
                                <div data-role="controlgroup" data-type="horizontal">
                                        <a id="bAdd" href="#" data-role="button" data-icon="plus" >Add new item</a>
@@ -46,7 +46,7 @@
                        <div>Example #2 Call the widget Creator function.</div>
                        <div>
                                Call the widget's creator function after append element on HTML.<br>
-                               Usually, creator function is same to widget name. But, "button" widget is a little bit different.
+                               Usually, creator function is same to widget name. But, "button" widget is a little bit different. 
                                Call buttonMarkup() or trigger "create" to the parent of button.
                        </div>
                        <div>
@@ -55,7 +55,7 @@
                                        /* Append new button */<br>
                                        var buttonTemplate = "&ltdiv data-role='button' data-inline='true' " + "data-icon='call' data-style='circle' " + "data-theme='s' class='newbutton'&gt&lt/div&gt"; <br>
                                        $( buttonTemplate ).buttonMarkup().appendTo( "#buttonItems" ); <br><br>
-
+                                       
                                        /* It's same to call ".buttonMarkup()". */<br>
                                        $( "#buttonItems" ).trigger( "create" );
                                </p>

diff --git a/tips/pinch-event/pinch.js b/tips/pinch-event/pinch.js
index a5c6f32..f1e7702 100644 (file)
--- a/tips/pinch-event/pinch.js
+++ b/tips/pinch-event/pinch.js
@@ -38,4 +38,8 @@ $( document ).one( "pageshow", "#pinch_page", function () {
        $("#pinch_demo").on( "pinchend", function ( e, p ) {
                last_ratio = get_ratio( p.ratio );
        });
+
+       $( window ).bind( "galleryorientationchanged", function ( e ) {
+               last_ratio = 1;
+       });
 });

diff --git a/webappInit.js b/webappInit.js
index ea502a4..5f0cdd2 100644 (file)
--- a/webappInit.js
+++ b/webappInit.js
@@ -1,6 +1,6 @@
 $(document).on( "pageinit", "#main" , function () {
        if ( window.tizen && window.tizen.application ) {
-               $( "#main .ui-btn-back" ).on( "click", function () {
+               $( "#main .ui-btn-back" ).on( "vclick", function () {
                        window.tizen.application.getCurrentApplication().exit();
                        return false;
                });

diff --git a/webappOrientation.js b/webappOrientation.js
index 88043f9..90b42ee 100644 (file)
--- a/webappOrientation.js
+++ b/webappOrientation.js
@@ -19,7 +19,13 @@ function onErrorCallback ( error ) {
 
 try {
        if ( $.tizen.__tizen__.util.isMobileBrowser() ) {
-               tizen.systeminfo.addPropertyValueChangeListener( "DEVICE_ORIENTATION", onSuccessCallback, onErrorCallback );
+               /**
+                * Temporary rotation is blocked as TIZEN API is missing a flag,
+                * which can help to check if the orientation is locked or unlocked
+                * 
+                * JIRA https://tizendev.org/bugs/browse/N_SE-39394
+                */
+               //tizen.systeminfo.addPropertyValueChangeListener( "DEVICE_ORIENTATION", onSuccessCallback, onErrorCallback );
        }
 } catch ( exc ) {
        alert( exc.message );

diff --git a/widgets/grid/namecard.css b/widgets/grid/namecard.css
index d417eca..1d03786 100644 (file)
--- a/widgets/grid/namecard.css
+++ b/widgets/grid/namecard.css
@@ -11,9 +11,10 @@
        position : fixed;
        width : 4.4rem;
        height : 6.1rem;
+       margin-top: 0.3rem;
        margin-right: 0.3rem;
        margin-left: 0.3rem;
-       margin-bottom: 0.5rem;
+       margin-bottom: 0.3rem;
 }
 
 .ui-demo-namecard-pic {
@@ -44,9 +45,10 @@
        width : 5.1rem;
        height : 6.1rem;
        display: block;
+       margin-top: 0.1rem;
        margin-right: 0.3rem;
        margin-left: 0.3rem;
-       margin-bottom: 0.6rem;
+       margin-bottom: 0.1rem;
 }
 
 .ui-demo-namecard-contents-x {
@@ -84,6 +86,7 @@
        height : 70px;
        display:block;
        border-bottom-color: #444;
+       padding-top : 0.3rem;
 }
 
 .ui-demo-namecard-list-pic {

diff --git a/widgets/list/virtuallist.html b/widgets/list/virtuallist.html
index 990859a..a173d7f 100644 (file)
--- a/widgets/list/virtuallist.html
+++ b/widgets/list/virtuallist.html
@@ -1,23 +1,23 @@
-<!DOCTYPE html>
-<html>
-       <head></head>
-       <body>
-       <div data-role="page" id="list" data-add-back-btn="true">
-                       <div data-role="header" data-position="fixed">
-                               <h1>VIRTUAL LIST</h1>
-                       </div>
-                       <div data-role="content">
-                               <ul data-role="listview">
-                                       <li data-role="list-divider">Virtual List</li>
-                                       <li><a href="virtuallist-normal.html">Virtual List Normal Style 1line</a></li>
-                                       <li><a href="virtuallist-normal_3_1_4.html">Virtual List Normal Style 1line-btn1</a></li>
-                                       <li><a href="virtuallist-normal_3_1_14.html">Virtual List Normal Style 1line-bigicon5</a></li>
-                                       <li><a href="virtuallist-normal_3_2_7.html">Virtual List Normal Style 2line-star1</a></li>
-                               </ul>
-                       </div>
-                       <div data-role="footer">
-                       </div>
-               </div>
-       </div>
-       </body>
-</html>
+<!DOCTYPE html>\r
+<html>\r
+       <head></head>\r
+       <body>\r
+       <div data-role="page" id="list" data-add-back-btn="true">\r
+                       <div data-role="header" data-position="fixed">\r
+                               <h1>VIRTUAL LIST</h1>\r
+                       </div>\r
+                       <div data-role="content">\r
+                               <ul data-role="listview">\r
+                                       <li data-role="list-divider">Virtual List</li>\r
+                                       <li><a href="virtuallist-normal.html">Virtual List Normal Style 1line</a></li>\r
+                                       <li><a href="virtuallist-normal_3_1_4.html">Virtual List Normal Style 1line-btn1</a></li>\r
+                                       <li><a href="virtuallist-normal_3_1_14.html">Virtual List Normal Style 1line-bigicon5</a></li>\r
+                                       <li><a href="virtuallist-normal_3_2_7.html">Virtual List Normal Style 2line-star1</a></li>\r
+                               </ul>\r
+                       </div>\r
+                       <div data-role="footer">\r
+                       </div>\r
+               </div>\r
+       </div>\r
+       </body>\r
+</html>\r

diff --git a/widgets/multimediaview/Color_short_version.mp4 b/widgets/multimediaview/Color_short_version.mp4
new file mode 100755 (executable)
index 0000000..e81e035
Binary files /dev/null and b/widgets/multimediaview/Color_short_version.mp4 differ

diff --git a/widgets/multimediaview/multimediaview_audio.html b/widgets/multimediaview/multimediaview_audio.html
index 31c4cc2..80f82e1 100644 (file)
--- a/widgets/multimediaview/multimediaview_audio.html
+++ b/widgets/multimediaview/multimediaview_audio.html
@@ -10,8 +10,7 @@
        </div>
        <div data-role="content">
                <audio data-controls="true" style="width:100%;">
-                       <source src="http://www.w3schools.com/html5/mov_bbb.mp4" type="audio/mp4" />
-                       <source src="http://www.w3schools.com/html5/mov_bbb.ogg" type="audio/ogg" />
+                       <source src="./Color_short_version.mp4" type="audio/mp4" />
                        <p>Your browser does not support the audio tag.</p>
                </audio>
        </div>

diff --git a/widgets/multimediaview/multimediaview_video.html b/widgets/multimediaview/multimediaview_video.html
index 54413d8..b761eb6 100644 (file)
--- a/widgets/multimediaview/multimediaview_video.html
+++ b/widgets/multimediaview/multimediaview_video.html
@@ -10,9 +10,7 @@
        </div>
        <div data-role="content">
                <video data-controls="true" style="width:100%;">
-                       <source src="http://www.w3schools.com/html5/mov_bbb.mp4" type="video/mp4" />
-                       <source src="http://www.w3schools.com/html5/mov_bbb.ogg" type="video/ogg" />
-                       <source src="http://www.w3schools.com/html5/mov_bbb.webm" type="video/webm" />
+                       <source src="Color_short_version.mp4" type="video/mp4" />
                        <p>Your browser does not support the video tag.</p>
                </video>
        </div>

diff --git a/widgets/naviframe/headerandfooter.html b/widgets/naviframe/headerandfooter.html
index ff4836e..016c718 100644 (file)
--- a/widgets/naviframe/headerandfooter.html
+++ b/widgets/naviframe/headerandfooter.html
@@ -20,7 +20,7 @@
 
        <div data-role="page" id="NavigationbarMain" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>HEADER AND FOOTER</h1>
+                       <h1>Header and footer</h1>
                </div>
                <div data-role="content">
                        <div class="content-primary">

diff --git a/widgets/naviframe/naviframe.html b/widgets/naviframe/naviframe.html
index cb23541..34f53e5 100644 (file)
--- a/widgets/naviframe/naviframe.html
+++ b/widgets/naviframe/naviframe.html
@@ -20,7 +20,7 @@
 
        <div data-role="page" id="NavigationbarMain" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>NAVIFRAME</h1>
+                       <h1>Naviframe</h1>
                </div>
                <div data-role="content">
                        <div class="content-primary">

diff --git a/widgets/naviframe/naviframe_footer_more.html b/widgets/naviframe/naviframe_footer_more.html
index b074648..983b88a 100644 (file)
--- a/widgets/naviframe/naviframe_footer_more.html
+++ b/widgets/naviframe/naviframe_footer_more.html
@@ -20,7 +20,7 @@
 
 <div data-role="page" data-add-back-btn="true">
        <div data-role="header" data-position="fixed">
-               <h1>FOOTER MORE</h1>
+               <h1>Footer more</h1>
        </div>
        <div data-role="content">
                <p>Footer more sample</p>

diff --git a/widgets/naviframe/naviframe_footer_more_button.html b/widgets/naviframe/naviframe_footer_more_button.html
index 01a63ac..f0aba6e 100644 (file)
--- a/widgets/naviframe/naviframe_footer_more_button.html
+++ b/widgets/naviframe/naviframe_footer_more_button.html
@@ -20,7 +20,7 @@
 
 <div data-role="page" data-add-back-btn="true">
        <div data-role="header" data-position="fixed">
-               <h1>FOOTER MORE</h1>
+               <h1>Footer more</h1>
        </div>
        <div data-role="content">
                <p>Footer more sample</p>

diff --git a/widgets/naviframe/naviframe_title_text.html b/widgets/naviframe/naviframe_title_text.html
index 03fc9e2..1c1bb27 100644 (file)
--- a/widgets/naviframe/naviframe_title_text.html
+++ b/widgets/naviframe/naviframe_title_text.html
@@ -20,7 +20,9 @@
 
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>TITLE TEXT</h1>
+                       <h1>Title text</h1>
+                       <div data-role="button">Cancel</div>
+                       <div data-role="button">Cancel</div>
                </div>
                <div data-role="content">
                        <p>title text sample</p>

diff --git a/widgets/naviframe/naviframe_title_text_1_btn.html b/widgets/naviframe/naviframe_title_text_1_btn.html
index 68c18df..f8818a2 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_1_btn.html
+++ b/widgets/naviframe/naviframe_title_text_1_btn.html
@@ -19,8 +19,8 @@
 <body>
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>TITLE 1 BUTTON</h1>
-                       <div data-role="button" data-icon="home" class="naviframe-button"></div>
+                       <h1>Title 1 button</h1>
+                       <div data-role="button" data-icon="naviframe-selectall" class="naviframe-button"></div>
                </div>
                <div data-role="content">
                                <p>Title text Button 01 sample</p>

diff --git a/widgets/naviframe/naviframe_title_text_2_btn.html b/widgets/naviframe/naviframe_title_text_2_btn.html
index ef9e1a4..01925e1 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_2_btn.html
+++ b/widgets/naviframe/naviframe_title_text_2_btn.html
@@ -19,9 +19,9 @@
 <body>
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>TITLE 2 BUTTONS </h1>
+                       <h1>Title 2 buttons</h1>
                        <div data-role="button" data-icon="naviframe-cancel" class="naviframe-button"></div>
-                       <div data-role="button" data-icon="naviframe-edit" class="naviframe-button"></div>
+                       <div data-role="button" data-icon="naviframe-done" class="naviframe-button"></div>
                </div>
                <div data-role="content">
                                <p>Title text Button 02 sample</p>

diff --git a/widgets/naviframe/naviframe_title_text_multiline.html b/widgets/naviframe/naviframe_title_text_multiline.html
index 9f34f12..1f31472 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_multiline.html
+++ b/widgets/naviframe/naviframe_title_text_multiline.html
@@ -20,7 +20,7 @@
 
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
-                       <h1>TITLE TEXT MULTILINE</h1>
+                       <h1>Title text multiline</h1>
                        <span class="ui-title-text-sub">tizen@samsung.com</span>
                </div>
                <div data-role="content">

diff --git a/widgets/naviframe/naviframe_title_text_multiline_src.html b/widgets/naviframe/naviframe_title_text_multiline_src.html
index 274b544..480952a 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_multiline_src.html
+++ b/widgets/naviframe/naviframe_title_text_multiline_src.html
@@ -21,8 +21,8 @@
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <img src="icon-tizen.png"/>
-                       <h1>TITLE DEMO</h1>
-                       <span class="ui-title-text-sub">TITLE IMAGE MULTILINE</span>
+                       <h1>Title demo</h1>
+                       <span class="ui-title-text-sub">Title image multiline</span>
                </div>
                <div data-role="content">
                        <p>Image Title text Multiline sample</p>

diff --git a/widgets/naviframe/naviframe_title_text_multiline_src_2_btn.html b/widgets/naviframe/naviframe_title_text_multiline_src_2_btn.html
index 53d1ddc..8ef9c06 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_multiline_src_2_btn.html
+++ b/widgets/naviframe/naviframe_title_text_multiline_src_2_btn.html
@@ -21,10 +21,10 @@
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <img src="icon-tizen.png"/>
-                       <h1>TITLE DEMO</h1>
-                       <span class="ui-title-text-sub">TITLE IMAGE MULTILINE 2 BUTTONS</span>
+                       <h1>Title demo</h1>
+                       <span class="ui-title-text-sub">Title image multiline 2 buttons</span>
+                       <div data-role="button" data-icon="naviframe-delete" class="naviframe-button"></div>
                        <div data-role="button" data-icon="naviframe-edit" class="naviframe-button"></div>
-                       <div data-role="button" data-icon="naviframe-more" class="naviframe-button"></div>
                </div>
                <div data-role="content">
                        <p>Image Title text Multiline Button 02 sample</p>

diff --git a/widgets/naviframe/naviframe_title_text_src.html b/widgets/naviframe/naviframe_title_text_src.html
index dff8bde..7398f72 100644 (file)
--- a/widgets/naviframe/naviframe_title_text_src.html
+++ b/widgets/naviframe/naviframe_title_text_src.html
@@ -21,7 +21,7 @@
        <div data-role="page" data-add-back-btn="true">
                <div data-role="header" data-position="fixed">
                        <img src="icon-tizen.png"/>
-                       <h1>TITLE IMAGE</h1>
+                       <h1>Title image</h1>
                </div>
                <div data-role="content">
                        <p>Image Title text sample</p>

diff --git a/widgets/radio/radio.html b/widgets/radio/radio.html
index 64754af..8938690 100644 (file)
--- a/widgets/radio/radio.html
+++ b/widgets/radio/radio.html
@@ -26,7 +26,7 @@
 
                        <div data-role="content">
                                <div class="content-primary">
-                                       <fieldset data-role="controlgroup">
+                                       <fieldset data-role="controlgroup" class="choosepet">
                                                <legend>Choose a pet:</legend>
                                                <input type="radio" name="radio-choice" id="radio-choice-1" value="choice-1" checked="checked" />
                                                <label for="radio-choice-1">Cat</label>

diff --git a/widgets/radio/radio.js b/widgets/radio/radio.js
index 3498bae..e1aee12 100644 (file)
--- a/widgets/radio/radio.js
+++ b/widgets/radio/radio.js
@@ -1,5 +1,5 @@
 $( document ).one( "pagecreate", "#radio-demo", function () {
-       $("input[type='radio']").on( "change", function (event, ui) {
+       $(".choosepet input[type='radio']").on( "change", function (event, ui) {
                if ( this.checked ) {
                        $( ".triggered-radio" ).text( this.id + " is selected..." );
                }

diff --git a/widgets/tabbar/tabbar_footer_icon.html b/widgets/tabbar/tabbar_footer_icon.html
index 9f83334..a579fe7 100644 (file)
--- a/widgets/tabbar/tabbar_footer_icon.html
+++ b/widgets/tabbar/tabbar_footer_icon.html
@@ -28,9 +28,9 @@
        <div data-role="footer">
                <div data-role="tabbar">
                        <ul>
-                               <li><a href="#" data-icon="tabedit" class="ui-btn-active"></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
+                               <li><a href="#" data-icon="naviframe-delete" class="ui-btn-active"></a></li>
+                               <li><a href="#" data-icon="naviframe-edit" ></a></li>
+                               <li><a href="#" data-icon="naviframe-search" ></a></li>
                        </ul>
                </div>
        </div>

diff --git a/widgets/tabbar/tabbar_icon.html b/widgets/tabbar/tabbar_icon.html
index 24726dd..d2dd09e 100644 (file)
--- a/widgets/tabbar/tabbar_icon.html
+++ b/widgets/tabbar/tabbar_icon.html
@@ -22,9 +22,9 @@
        <div data-role="header" data-position="fixed">
                <div data-role="tabbar">
                        <ul>
-                               <li><a href="#" data-icon="tabedit" class="ui-btn-active"></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
+                               <li><a href="#" data-icon="naviframe-delete" class="ui-btn-active"></a></li>
+                               <li><a href="#" data-icon="naviframe-plus" ></a></li>
+                               <li><a href="#" data-icon="naviframe-search" ></a></li>
                        </ul>
                </div>
        </div>

diff --git a/widgets/tabbar/tabbar_icon_text.html b/widgets/tabbar/tabbar_icon_text.html
index 5251161..fd02072 100644 (file)
--- a/widgets/tabbar/tabbar_icon_text.html
+++ b/widgets/tabbar/tabbar_icon_text.html
@@ -22,9 +22,9 @@
        <div data-role="header" data-position="fixed">
                <div data-role="tabbar">
                        <ul>
-                               <li><a href="#" data-icon="tabedit" class="ui-btn-active">Menu</a></li>
-                               <li><a href="#" data-icon="tabedit" >Save</a></li>
-                               <li><a href="#" data-icon="tabedit" >Share</a></li>
+                               <li><a href="#" data-icon="naviframe-delete" class="ui-btn-active">Delete</a></li>
+                               <li><a href="#" data-icon="naviframe-edit" >Edit</a></li>
+                               <li><a href="#" data-icon="naviframe-search" >Search</a></li>
 
                        </ul>
                </div>

diff --git a/widgets/tabbar/tabbar_title_icon.html b/widgets/tabbar/tabbar_title_icon.html
index f6e25ca..2f74d04 100644 (file)
--- a/widgets/tabbar/tabbar_title_icon.html
+++ b/widgets/tabbar/tabbar_title_icon.html
@@ -23,9 +23,9 @@
                <h1>TABBAR ICON WITH TITLE</h1>
                <div data-role="tabbar">
                        <ul>
-                               <li><a href="#" data-icon="tabedit" class="ui-btn-active"></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
-                               <li><a href="#" data-icon="tabedit" ></a></li>
+                               <li><a href="#" data-icon="naviframe-delete" class="ui-btn-active"></a></li>
+                               <li><a href="#" data-icon="naviframe-edit" ></a></li>
+                               <li><a href="#" data-icon="naviframe-search" ></a></li>
                        </ul>
                </div>
        </div>