projects / samples / web / HybridWebApp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b5efd72)
[HybridWebApp]Updated Private -> RSA
authorji.ji <ji.ji@samsung.com>
Tue, 9 Jul 2013 10:21:07 +0000 (19:21 +0900)
committerji.ji <ji.ji@samsung.com>
Tue, 9 Jul 2013 10:21:07 +0000 (19:21 +0900)
Change-Id: I17217cbc27ea640a5d0a962f00be3870bd077016

config.xml patch | blob | history
css/style.css patch | blob | history
index.html patch | blob | history
js/main.js patch | blob | history

diff --git a/config.xml b/config.xml
index 60d9348..cbf619a 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -3,6 +3,6 @@
     <tizen:application id="blaJxcU1Jq.HybridWebApp" package="blaJxcU1Jq" required_version="2.2"/>
     <content src="index.html"/>
     <icon src="icon.png"/>
-    <name>HybridWebApp</name>
+    <name>Hybrid web app</name>
     <tizen:privilege name="http://tizen.org/privilege/application.launch"/>
 </widget>
diff --git a/css/style.css b/css/style.css
index ea4ca48..9c5a4cd 100755 (executable)
--- a/css/style.css
+++ b/css/style.css
@@ -2,6 +2,6 @@ body {
        width: 100%;
 }
 
-div[data-role=header] {
-       text-transform: uppercase;
+.ui-tabbar-margin-back {
+       margin-right:0 !important;
 }
diff --git a/index.html b/index.html
index d34209b..31b3fdd 100644 (file)
--- a/index.html
+++ b/index.html
@@ -5,7 +5,7 @@
                <meta name="viewport" content="width=360, user-scalable=no"/>
                <meta name="description" content="Hybrid Web Application Sample"/>
 
-               <title>HybridWebApp</title>
+               <title>Hybrid web app</title>
                <script src="/usr/share/tizen-web-ui-fw/latest/js/jquery.min.js"></script>
                <script src="./js/config.js"></script>
                <script src="/usr/share/tizen-web-ui-fw/latest/js/tizen-web-ui-fw-libs.min.js"></script>
@@ -15,9 +15,9 @@
        </head>
 
        <body>
-               <div data-role="page" id="main" data-add-back-btn="true">
+               <div data-role="page" id="main">
                        <div data-role="header" data-position="fixed">
-                               <h1>Hybrid Web App</h1>
+                               <h1>Hybrid web app</h1>
                        </div>
 
                        <div data-role="content" id="history">
diff --git a/js/main.js b/js/main.js
index 6b12453..b5afcd0 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -27,15 +27,10 @@ var gLocalMessagePortWatchId;
 var isStarting = false;
 
 $(document).delegate("#main", "pageinit", function() {
-       $("#main .ui-btn-back").bind("vclick", function() {
-               tizen.application.getCurrentApplication().exit();
-               return false;
-       });
-
        $("#btn-start").bind("vclick", function(){
 
                if(gLocalMessagePort) {
-                       alert("Already Started");
+                       alert("Already running.");
                } else if(isStarting){
                        alert("Now starting...");
                } else {
@@ -48,7 +43,7 @@ $(document).delegate("#main", "pageinit", function() {
                if(gRemoteMessagePort) {
                        sendCommand("stop");
                } else {
-                       alert("Not Started");
+                       alert("Not running.");
                }
                return false;
        });
@@ -56,8 +51,8 @@ $(document).delegate("#main", "pageinit", function() {
                $("#logs").empty().listview("refresh");
                return false;
        });
-       document.addEventListener( 'tizenhwkey', function(e) {
-               if (e.keyName === 'back') {
+       $(window).on('tizenhwkey', function (e) {
+               if (e.originalEvent.keyName === "back") {
                        if ($.mobile.activePage.attr('id') === 'main') {
                                tizen.application.getCurrentApplication().exit();
                        } else {
@@ -199,6 +194,7 @@ function launchServiceApp() {
        function onError(err) {
                console.log("Service Applaunch failed");
                isStarting = false;
+               alert("Failed to launch HybridServiceApp!");
        }
 
        try {
Domain: Applications / Web Sample;