Naviframe : apply SIP down status to footer

Change-Id: I1a6360e7e81518a0614f823558895dfbbff0e6d2

Conflicts:

	src/js/widgets/jquery.mobile.tizen.pagelayout.js

diff --git a/src/js/widgets/jquery.mobile.tizen.pagelayout.js b/src/js/widgets/jquery.mobile.tizen.pagelayout.js
index 83df532..0bf2622 100644 (file)
--- a/src/js/widgets/jquery.mobile.tizen.pagelayout.js
+++ b/src/js/widgets/jquery.mobile.tizen.pagelayout.js
@@ -242,16 +242,27 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
                                });
 
                        window.addEventListener( "softkeyboardchange", function ( e ) {
-                               var thisPage = $( ".ui-page-active" );
-
-                               if ( e.state == "on" ) {
-                                       $elCurrentFooter = $( ".ui-page-active .ui-footer" );
-                                       $elCurrentFooter.hide();
-                               } else if (e.state == "off") {
-                                       $elCurrentFooter.show();
+                               var $elDownBtn = $( "<div class='ui-btn-footer-down'></div>" ),
+                                       $elPage = $( ".ui-page-active" ),
+                                       backBtnPosition = "footer";
+
+                               if ( $elPage.data( "addBackBtn" ) ) {
+                                       $elPage.data( "addBackBtn" ) == "header" ? backBtnPosition = "header" : backBtnPosition = "footer";
+
+                                       if ( e.state == "on" ) {
+                                               if ( !$elPage.find( ".ui-" + backBtnPosition + " .ui-btn-footer-down" ).length ) {
+                                                       $elDownBtn.buttonMarkup( { icon: "down" } ).appendTo( $elPage.find( ".ui-" + backBtnPosition ) );
+                                                       $( ".ui-btn-footer-down" ).bind( "vclick",  function ( ) {
+                                                               $elPage.find( "input" ).blur();
+                                                       });
+                                               }
+                                               $( ".ui-page-active .ui-btn-back" ).remove();
+                                       } else if ( e.state == "off" ) {
+                                               $elPage.page( "addBackBtn", backBtnPosition );
+                                               $( ".ui-btn-footer-down" ).remove();
+                                       }
                                }
-                               self.updatePagePadding( thisPage );
-                               self.updatePageLayout( thisPage, true );
+
                        });
                },
 

diff --git a/src/themes/tizen/common/jquery.mobile.button.less b/src/themes/tizen/common/jquery.mobile.button.less
index 3d8fe9f..f03ad4f 100644 (file)
--- a/src/themes/tizen/common/jquery.mobile.button.less
+++ b/src/themes/tizen/common/jquery.mobile.button.less
@@ -100,7 +100,10 @@
 .ui-header .ui-btn.ui-btn-box-s.ui-btn-down-s:not(.ui-input-cancel):not(.ui-btn-search-front-icon) .ui-btn-inner,
 .ui-btn.ui-btn-back.ui-btn-up-s .ui-btn-inner,
 .ui-btn.ui-btn-back.ui-btn-hover-s .ui-btn-inner,
-.ui-btn.ui-btn-back.ui-btn-down-s .ui-btn-inner
+.ui-btn.ui-btn-back.ui-btn-down-s .ui-btn-inner,
+.ui-btn.ui-btn-footer-down.ui-btn-up-s > .ui-btn-inner,
+.ui-btn.ui-btn-footer-down.ui-btn-hover-s > .ui-btn-inner,
+.ui-btn.ui-btn-footer-down.ui-btn-down-s > .ui-btn-inner
 {
        background: transparent;
        border: none;

diff --git a/src/themes/tizen/common/jquery.mobile.theme.less b/src/themes/tizen/common/jquery.mobile.theme.less
index 7a6e56f..321ce90 100644 (file)
--- a/src/themes/tizen/common/jquery.mobile.theme.less
+++ b/src/themes/tizen/common/jquery.mobile.theme.less
@@ -19,7 +19,8 @@
        }
        
        
-       > .ui-btn.ui-btn-back {
+       > .ui-btn.ui-btn-back,
+       > .ui-btn.ui-btn-footer-down {
                background : transparent;
 
                position : absolute;
@@ -29,8 +30,19 @@
                        top : 8 * @unit_base;
                        left : auto;
                        right : 13 * @unit_base;
+                       margin-top : 0px;
+               }
+       }
 
-                       margin-top : 0px
+       > .ui-btn.ui-btn-footer-down {
+               border : none;
+               box-shadow : none;
+               .ui-icon {
+                       top : 8 * @unit_base;
+                       left : auto;
+                       right : 13 * @unit_base;
+
+                       margin-top : 0px;
                }
        }
 }
@@ -67,7 +79,8 @@
                }
        }
 
-       > .ui-btn.ui-btn-back {
+       > .ui-btn.ui-btn-back,
+       > .ui-btn.ui-btn-footer-down {
                right : 13 * @unit_base;
        }
 
@@ -166,6 +179,7 @@
        text-align : center;
        bottom : 0px;
        >.ui-btn.ui-btn-back,
+       >.ui-btn.ui-btn-footer-down,
        >[data-icon="naviframe-more"] {
                background : transparent;
 
@@ -368,6 +382,9 @@
 .ui-btn-back.ui-btn-up-s,
 .ui-btn-back.ui-btn-hover-s,
 .ui-btn-back.ui-btn-down-s,
+.ui-btn-footer-down.ui-btn-up-s,
+.ui-btn-footer-down.ui-btn-hover-s,
+.ui-btn-footer-down.ui-btn-down-s,
 .ui-popup-container .ui-btn-box-s {
        font-weight: normal;
        .LESSborder-radius-all( 0.9 rem );
@@ -485,7 +502,8 @@ a.ui-link-inherit {
        }
 }
 
-.ui-btn-back .ui-btn-inner .ui-icon-header-back-btn {
+.ui-btn-back .ui-btn-inner .ui-icon-header-back-btn,
+.ui-btn-footer-down .ui-btn-inner .ui-icon {
        width: 32 * @unit_base; 
        height: 32 * @unit_base;
 
@@ -500,6 +518,7 @@ a.ui-link-inherit {
        .ui-icon-naviframe-cancel { background-image: url(images/00_icon_cancel.png); } /* FIXME : check ux if it needs to be deprecated... */
        .ui-icon-naviframe-edit { background-image: url(images/page/00_icon_edit.png); }
        .ui-icon-naviframe-plus { background-image: url(images/page/00_icon_plus.png); }
+       .ui-icon-down { background-image: url(images/controls/button/00_button_down.png); }
 }
 
 .ui-btn-down-s {
@@ -508,6 +527,7 @@ a.ui-link-inherit {
        .ui-icon-naviframe-cancel { background-image: url(images/00_icon_cancel_press.png); } /* FIXME: check ux if it needs to be deprecated.. */
        .ui-icon-naviframe-edit { background-image: url(images/page/00_icon_edit_press.png); }
        .ui-icon-naviframe-plus { background-image: url(images/page/00_icon_plus_press.png); }
+       .ui-icon-down { background-image: url(images/controls/button/00_button_down_press.png); }
 }
 
 /* Interaction cues

diff --git a/src/themes/tizen/tizen-white/images/controls/button/00_button_down.png b/src/themes/tizen/tizen-white/images/controls/button/00_button_down.png
new file mode 100644 (file)
index 0000000..c04e1a5
Binary files /dev/null and b/src/themes/tizen/tizen-white/images/controls/button/00_button_down.png differ

diff --git a/src/themes/tizen/tizen-white/images/controls/button/00_button_down_press.png b/src/themes/tizen/tizen-white/images/controls/button/00_button_down_press.png
new file mode 100644 (file)
index 0000000..4096764
Binary files /dev/null and b/src/themes/tizen/tizen-white/images/controls/button/00_button_down_press.png differ