[BluetoothChat] updated BluetoothChat sources

Change-Id: Ie0877e8f81386eef189db7c790b2cadfe08619fb

diff --git a/css/style.css b/css/style.css
index b58c955..4f065b9 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -74,10 +74,6 @@ html {
        width: 40px;
 }
 
-#keyboard-ok-button {
-       width: 30%;
-}
-
 #ui-textArea {
        position: absolute;
        width: 100%;

diff --git a/js/app.model.js b/js/app.model.js
index 0cda8d1..b1e9085 100644 (file)
--- a/js/app.model.js
+++ b/js/app.model.js
@@ -39,7 +39,16 @@ function Model() {
 
                powerOn: function Model_powerOn(callback) {
                        if (!this.adapter.powered) {
-                               this.adapter.setPowered(true, function () { setTimeout(function () { callback(); }, 500); }, function () {});
+                               try {
+                                       this.adapter.setPowered(true,
+                                               function () {
+                                                       setTimeout(function () { callback(); }, 500);
+                                               }
+                                       );
+                               } catch (error) {
+                                       alert(error.message);
+                                       app.ui.showPowerOnButton();
+                               }
                        } else {
                                callback();
                        }

diff --git a/templates/keyboard_page.tpl b/templates/keyboard_page.tpl
index d9b1fef..1722089 100644 (file)
--- a/templates/keyboard_page.tpl
+++ b/templates/keyboard_page.tpl
@@ -1,10 +1,16 @@
-<div data-role="page" id="keyboard" data-add-back-btn="none">
+<div data-role="page" id="keyboard">
        <div data-role="header" id="keyboard-header" data-position="fixed">
                <h1></h1>
        </div>
 
        <div data-role="content" id="keyboard-content">
                <input type="text" id="keyboard-text" maxlength="20"/>
-               <div data-role="button" class="ui-btn-start" id="keyboard-ok-button">OK</div>
+       </div>
+       <div data-role="footer" data-position="fixed">
+               <div data-role="tabbar" data-style="tabbar">
+                       <ul>
+                               <li id="keyboard-ok-button"><a href="#">OK</a></li>
+                       </ul>
+               </div>
        </div>
 </div>
\ No newline at end of file