From bf983ca18105f422137c144d552853f3c8df0f60 Mon Sep 17 00:00:00 2001 From: Jinhyuk Jun Date: Mon, 24 Jun 2013 15:28:15 +0900 Subject: [PATCH] HWkey : remove framework's device check routine Change-Id: I3bf40c9ad6f57f4834444e49435ea502d0e22c4b --- demos/tizen-winsets/main.js | 21 --------------------- src/js/jquery.mobile.tizen.loader.js | 5 +---- src/js/widgets/jquery.mobile.tizen.pagelayout.js | 9 +++------ 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/demos/tizen-winsets/main.js b/demos/tizen-winsets/main.js index b9a276c..70dd50b 100644 --- a/demos/tizen-winsets/main.js +++ b/demos/tizen-winsets/main.js @@ -1,24 +1,3 @@ $( 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/src/js/jquery.mobile.tizen.loader.js b/src/js/jquery.mobile.tizen.loader.js index 802a70e..8362797 100644 --- a/src/js/jquery.mobile.tizen.loader.js +++ b/src/js/jquery.mobile.tizen.loader.js @@ -59,10 +59,7 @@ If developers do not give a viewport meta tag, Tizen Web UI Framework automatica defaultFontSize: 22, minified: false, - deviceCapa: window.tizen ? - ( window.tizen.systeminfo ? - window.tizen.systeminfo.getCapabilities() : null ) - : null, + deviceCapa: { inputKeyBack: true, inputKeyMenu: true }, debug: false }, diff --git a/src/js/widgets/jquery.mobile.tizen.pagelayout.js b/src/js/widgets/jquery.mobile.tizen.pagelayout.js index 1c2c9b0..1b5fa2f 100644 --- a/src/js/widgets/jquery.mobile.tizen.pagelayout.js +++ b/src/js/widgets/jquery.mobile.tizen.pagelayout.js @@ -229,8 +229,7 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { self._updateFooterArea( thisPage ); // check device api : HW key existance - if ( $.tizen && $.tizen.frameworkData.deviceCapa - && $.tizen.frameworkData.deviceCapa.inputKeyBack ) { + if ( false ) { self._bindHWkey(); self._setHWKeyLayout( thisPage ); } @@ -277,15 +276,13 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) { // new page's one, and the old page's .ui-btn-back button is still hidden. // So, the current back button is remembered to be shown at the // softkeyboardchange.off event. - if ( !($.tizen && $.tizen.frameworkData.deviceCapa - && $.tizen.frameworkData.deviceCapa.inputKeyBack ) ) { + if ( true ) { backBtn = $( ".ui-page-active .ui-btn-back" ); backBtn.hide(); self._backBtnQueue.push( backBtn ); // Store hidden backBtn } } else if ( e.state == "off" ) { - if ( !($.tizen && $.tizen.frameworkData.deviceCapa - && $.tizen.frameworkData.deviceCapa.inputKeyBack ) ) { + if ( true ) { self._backBtnQueue.forEach( function ( b ) { b.show(); // Show each backBtn, } ); -- 2.7.4