From 28ff6e1150d543fd1c2c999f70b31416bac538e6 Mon Sep 17 00:00:00 2001 From: Bryce Curtis Date: Thu, 11 Nov 2010 16:20:32 -0600 Subject: [PATCH] Merged code for bryfox: Re-add support for search & menu key triggers. See original commit: https://github.com/bryfox/phonegap-android/commit/799515fa7b8b5ccc94487e519f520929104ade2c --- framework/assets/js/keyevent.js | 36 +++++++++++++----------- framework/src/com/phonegap/DroidGap.java | 8 ++++-- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/framework/assets/js/keyevent.js b/framework/assets/js/keyevent.js index 683dbd8a..73d81e22 100755 --- a/framework/assets/js/keyevent.js +++ b/framework/assets/js/keyevent.js @@ -6,25 +6,27 @@ * Copyright (c) 2010, IBM Corporation */ -function KeyEvent() -{ +function KeyEvent() { } -KeyEvent.prototype.backTrigger = function() -{ - var e = document.createEvent('Events'); - e.initEvent('backKeyDown'); - document.dispatchEvent(e); -} +KeyEvent.prototype.backTrigger = function() { + var e = document.createEvent('Events'); + e.initEvent('backKeyDown'); + document.dispatchEvent(e); +}; -KeyEvent.prototype.menuTrigger = function() -{ - var e = document.createEvent('Events'); - e.initEvent('menuKeyDown'); - document.dispatchEvent(e); -} +KeyEvent.prototype.menuTrigger = function() { + var e = document.createEvent('Events'); + e.initEvent('menuKeyDown'); + document.dispatchEvent(e); +}; -if (document.keyEvent == null || typeof document.keyEvent == 'undefined') -{ - window.keyEvent = document.keyEvent = new KeyEvent(); +KeyEvent.prototype.searchTrigger = function() { + var e = document.createEvent('Events'); + e.initEvent('searchKeyDown'); + document.dispatchEvent(e); +}; + +if (document.keyEvent == null || typeof document.keyEvent == 'undefined') { + window.keyEvent = document.keyEvent = new KeyEvent(); } diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java index 3cab6133..45db5573 100755 --- a/framework/src/com/phonegap/DroidGap.java +++ b/framework/src/com/phonegap/DroidGap.java @@ -816,11 +816,15 @@ public class DroidGap extends PhonegapActivity { } } - if (keyCode == KeyEvent.KEYCODE_MENU) { - // This is where we launch the menu + // If menu key + else if (keyCode == KeyEvent.KEYCODE_MENU) { appView.loadUrl("javascript:keyEvent.menuTrigger()"); } + // If search key + else if (keyCode == KeyEvent.KEYCODE_SEARCH) { + appView.loadUrl("javascript:keyEvent.searchTrigger()"); + } return false; }