From eebdd40064dd7e6b638cb4f4e358ebfd5e7e9170 Mon Sep 17 00:00:00 2001
From: Youmin Ha <youmin.ha@samsung.com>
Date: Sat, 8 Jun 2013 18:28:48 +0900
Subject: [PATCH] pagelayout: more popup style is applied even deviceAPI is not
 supported

Apply more popup style, even no Tizen device API is supported.

Change-Id: I8008d9cfafcaa1a0fb1db2e147e9b62246243b98
---
 demos/HWback/index.html                          |  8 ++---
 src/js/widgets/jquery.mobile.tizen.pagelayout.js | 43 ++++++++++++++----------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/demos/HWback/index.html b/demos/HWback/index.html
index 5ebb803..c5ef685 100755
--- a/demos/HWback/index.html
+++ b/demos/HWback/index.html
@@ -36,7 +36,7 @@
 
 		<div data-role="footer">
 			<a href="#menu" data-role="button" data-icon="naviframe-more" data-rel="popup"></a>
-			<div id="menu" data-role="popup" class="hardware">
+			<div id="menu" data-role="popup">
 				<ul data-role="listview">
 					<li><a href="#" data-rel="back">Settings</a></li>
 					<li><a href="#" data-rel="back">Add to contact</a></li>
@@ -58,7 +58,7 @@
 
 		<div data-role="footer">
 			<a href="#menu1" data-role="button" data-icon="naviframe-more" data-rel="popup"></a>
-			<div id="menu1" data-role="popup" class="hardware">
+			<div id="menu1" data-role="popup">
 				<ul data-role="listview">
 					<li><a href="#" data-rel="back">Settings</a></li>
 					<li><a href="#" data-rel="back">Add to contact</a></li>
@@ -82,7 +82,7 @@
 
 		<div data-role="footer">
 			<a href="#menu2" data-role="button" data-icon="naviframe-more" data-rel="popup"></a>
-			<div id="menu2" data-role="popup" class="hardware">
+			<div id="menu2" data-role="popup">
 				<ul data-role="listview">
 					<li><a href="#" data-rel="back">Settings</a></li>
 					<li><a href="#" data-rel="back">Add to contact</a></li>
@@ -103,7 +103,7 @@
 
                 <div data-role="footer" class="ui-footer-force-btn-show">
                         <a href="#menu2" data-role="button" data-icon="naviframe-more" data-rel="popup"></a>
-                        <div id="menu2" data-role="popup" class="hardware">
+                        <div id="menu2" data-role="popup">
                                 <ul data-role="listview">
                                         <li><a href="#" data-rel="back">Settings</a></li>
                                         <li><a href="#" data-rel="back">Add to contact</a></li>
diff --git a/src/js/widgets/jquery.mobile.tizen.pagelayout.js b/src/js/widgets/jquery.mobile.tizen.pagelayout.js
index 7f96e71..6b62bfc 100644
--- a/src/js/widgets/jquery.mobile.tizen.pagelayout.js
+++ b/src/js/widgets/jquery.mobile.tizen.pagelayout.js
@@ -225,11 +225,13 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
 					self.updatePagePadding( thisPage );
 					self._updateHeaderArea( thisPage );
 
-					/* check device api : HW key existance */
-					if ( $.tizen && $.tizen.frameworkData.deviceCapa && $.tizen.frameworkData.deviceCapa.inputKeyBack ) {
+					// check device api : HW key existance
+					if ( $.tizen && $.tizen.frameworkData.deviceCapa
+							&& $.tizen.frameworkData.deviceCapa.inputKeyBack ) {
 						self._bindHWkey();
 						self._setHWKeyLayout( thisPage );
 					}
+					self._setMenuPopupLayout( thisPage );
 
 					if ( o.updatePagePadding ) {
 						$( window ).bind( "throttledresize." + self.widgetName, function () {
@@ -299,7 +301,7 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
 		},
 
 		_bindHWkey: function () {
-			// if HW key not exist 
+			// if HW key not exist
 			// return true
 			// else
 			$( document ).on( "tizenhwkey", function( e ) {
@@ -379,15 +381,15 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
 			var $elPage = $( thisPage ),
 				$elFooter = $elPage.find( ":jqmData(role='footer')" ),
 				$elBackKey = $elFooter.children( ".ui-btn-back" ),
-				$elMoreKey = $elFooter.children(":jqmData(icon='naviframe-more')"),
-				cntMore = 0,
-				morePopup;
-
-				// Check HW Key option 
+				$elMoreKey = $elFooter.children(":jqmData(icon='naviframe-more')");
+				//cntMore = 0,
+			
+				// Check HW Key option
 			if ( $elFooter.hasClass("ui-footer-force-btn-show") ) {
-				return true;	
+				return true;
 			}
 
+			/*
 			if ( $elMoreKey.length ) {
 				cntMore = $elMoreKey.length + 1;
 			} else {
@@ -396,7 +398,6 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
 
 			// need to add device api to check HW key exist
 			// Case 1 : footer - BackKey/MoreKey/Button - hide BackKey/MoreKey
-			/*
 			if ( $elFooter.children().length - $elBackKey.length - cntMore > 0 ) {
 				$elBackKey.hide();
 				$elMoreKey.hide();
@@ -406,23 +407,29 @@ define( [ '../jquery.mobile.tizen.core' ], function ( ) {
 				$elMoreKey.hide();
 			}
 			*/
+
 			if( $elMoreKey ) {
 				$elMoreKey.hide();
-				if( $elMoreKey.get(0) && $elMoreKey.get(0).hash ) {
-					morePopup =  $( $elMoreKey.get(0).hash );
-					if( morePopup ) {
-						morePopup.addClass ( "hardware" );
-					}
-				}
 			}
-
 			if( $elBackKey ) {
 				$elBackKey.hide();
 			}
 			// Case 3 : no footer - do nothing
 
+			return true;
 		},
-
+		_setMenuPopupLayout: function ( thisPage ) {
+			var $page = $( thisPage ),
+				$footer = $page.find( ":jqmData(role='footer')" ),
+				moreKey = $page.find( ":jqmData(icon='naviframe-more')" )[0],
+				//cntMore = 0,
+				$morePopup;
+
+			if( moreKey && moreKey.hash ) {	// moreKey.hash = #morePopupID (from <a href="">)
+				$morePopup =  $( moreKey.hash );
+				$morePopup.addClass ( "hardware" );
+			}
+		 },
 
 		_visible: true,
 
-- 
2.7.4