[Title] common-eplugin: improved back button process

[Desc.]
[Issue] N_SE-51752

Change-Id: Iccf8a3db966012e8871a022d06de10f92aa92174

diff --git a/org.tizen.common.verrari/templates/cli/jqm-common-resources/js/main.js b/org.tizen.common.verrari/templates/cli/jqm-common-resources/js/main.js
index 56db226..7f1368a 100644 (file)
--- a/org.tizen.common.verrari/templates/cli/jqm-common-resources/js/main.js
+++ b/org.tizen.common.verrari/templates/cli/jqm-common-resources/js/main.js
@@ -7,10 +7,21 @@ var init = function () {
     // TODO:: Do your initialization job
     console.log("init() called");
 
-    // add eventListener for tizenhwkey
+    // add eventListener for tizenhwkey (Back Button)
     document.addEventListener('tizenhwkey', function(e) {
-        if(e.keyName == "back")
-            tizen.application.getCurrentApplication().exit();
+        if ( e.keyName == "back" ) {
+            try {
+                if ( $.mobile.urlHistory.activeIndex === 0 ) {
+                    document.removeEventListener( 'tizenhwkey', this );
+                    window.tizen.application.getCurrentApplication().exit();
+                } else {
+                    window.history.back();
+                }
+            } catch( ex ) {
+                document.removeEventListener( 'tizenhwkey', this );
+                window.tizen.application.getCurrentApplication().exit();
+            }
+        }
     });
 };
 $(document).bind('pageinit', init);

diff --git a/org.tizen.common.verrari/templates/cli/tizenwebuifw-common-resources/js/main.js b/org.tizen.common.verrari/templates/cli/tizenwebuifw-common-resources/js/main.js
index 56db226..7f1368a 100644 (file)
--- a/org.tizen.common.verrari/templates/cli/tizenwebuifw-common-resources/js/main.js
+++ b/org.tizen.common.verrari/templates/cli/tizenwebuifw-common-resources/js/main.js
@@ -7,10 +7,21 @@ var init = function () {
     // TODO:: Do your initialization job
     console.log("init() called");
 
-    // add eventListener for tizenhwkey
+    // add eventListener for tizenhwkey (Back Button)
     document.addEventListener('tizenhwkey', function(e) {
-        if(e.keyName == "back")
-            tizen.application.getCurrentApplication().exit();
+        if ( e.keyName == "back" ) {
+            try {
+                if ( $.mobile.urlHistory.activeIndex === 0 ) {
+                    document.removeEventListener( 'tizenhwkey', this );
+                    window.tizen.application.getCurrentApplication().exit();
+                } else {
+                    window.history.back();
+                }
+            } catch( ex ) {
+                document.removeEventListener( 'tizenhwkey', this );
+                window.tizen.application.getCurrentApplication().exit();
+            }
+        }
     });
 };
 $(document).bind('pageinit', init);

diff --git a/org.tizen.common.verrari/templates/jar/jqm-common-resources.jar b/org.tizen.common.verrari/templates/jar/jqm-common-resources.jar
index 33cc778..1e60450 100644 (file)
Binary files a/org.tizen.common.verrari/templates/jar/jqm-common-resources.jar and b/org.tizen.common.verrari/templates/jar/jqm-common-resources.jar differ

diff --git a/org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar b/org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar
index deae7ec..03270dd 100644 (file)
Binary files a/org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar and b/org.tizen.common.verrari/templates/jar/tizenwebuifw-common-resources.jar differ