From 09201986924c57607bf464c2b5bc540db5e87d8e Mon Sep 17 00:00:00 2001 From: "jaekuk, lee" Date: Tue, 29 Nov 2016 14:25:13 +0900 Subject: [PATCH] modify to send the key to web app Change-Id: Ie570309671cc31036fb3ad2aa1065e6079850c4c Signed-off-by: jaekuk, lee --- runtime/browser/web_application.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/runtime/browser/web_application.cc b/runtime/browser/web_application.cc index b496d53..e3b33b4 100755 --- a/runtime/browser/web_application.cc +++ b/runtime/browser/web_application.cc @@ -684,19 +684,22 @@ void WebApplication::OnOrientationLock( void WebApplication::OnHardwareKey(WebView* view, const std::string& keyname) { // NOTE: This code is added to enable back-key on remote URL + bool enabled = app_data_->setting_info() != NULL + ? app_data_->setting_info()->hwkey_enabled() + : true; + if (!common::utils::StartsWith(view->GetUrl(), kFileScheme)) { if (kKeyNameBack == keyname) { LOGGER(DEBUG) << "Back to previous page for remote URL"; if (!view->Backward()) { + if(enabled) + view->EvalJavascript(kBackKeyEventScript); RemoveWebViewFromStack(view_stack_.front()); } } return; } - bool enabled = app_data_->setting_info() != NULL - ? app_data_->setting_info()->hwkey_enabled() - : true; if (enabled && kKeyNameBack == keyname) { view->EvalJavascript(kBackKeyEventScript); // NOTE: This code is added for backward compatibility. -- 2.7.4