projects / samples / web / ContactsExchanger.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 39f0161)
[ContactsExchanger] updated ContactsExchanger sources
authorPiotr Dabrowski <p.dabrowski2@samsung.com>
Tue, 23 Jul 2013 10:09:42 +0000 (12:09 +0200)
committerPiotr Dabrowski <p.dabrowski2@samsung.com>
Tue, 23 Jul 2013 10:09:42 +0000 (12:09 +0200)
Change-Id: Ifb312ce1185b2b716097eb610f498637055e32dd

css/style.css patch | blob | history
index.html patch | blob | history
js/app.js patch | blob | history
js/app.ui.js patch | blob | history

diff --git a/css/style.css b/css/style.css
index 0f5e70a..97c62b5 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -33,9 +33,6 @@
        padding: 0 32px;
        width: 296px;
        text-align: center;
-       display: table-cell;
-       vertical-align: middle;
-       height: inherit;
 }
 
 #waitingBox {
diff --git a/index.html b/index.html
index d687ef9..92afd2c 100644 (file)
--- a/index.html
+++ b/index.html
@@ -25,13 +25,12 @@
 
 <body>
        <div id="start" data-role="page">
-               <div data-role="header" id="header-start" data-position="fixed">
+               <div data-role="header" id="header-start">
                        <h1>Contacts exchanger</h1>
                </div>
-
-               <div data-role="content" id="content-start">
-                       <div id="contact-nfc-error" data-role="popup" class="center_title_1btn">
-                               <div class="ui-popup-title"><h1>Warning</h1></div>
+               <div data-role="content" id="content-start">loading</div>
+               <div id="contact-nfc-error" data-role="popup" class="center_title_1btn">
+                       <div class="ui-popup-title"><h1>Warning</h1></div>
                        <div class="ui-popup-text">
                                If you want to use "Contact Exchanger" you must agree to access
                                Contacts and NFC by this application.
@@ -40,7 +39,6 @@
                                <a data-role="button" data-rel="back" data-inline="true"
                                        id="acceptWarning">OK</a>
                        </div>
-                       </div>
                </div>
        </div>
 
diff --git a/js/app.js b/js/app.js
index b48f869..c246916 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -44,7 +44,6 @@ var app = null;
                        this.ui = new App.Ui(this);
                        this.nfc = new App.NFCControl(this);
 
-                       this.ui.disableSelections();
                        this.ui.defineEvents();
                        this.initAddressBook();
                        this.nfc.startNFC();
diff --git a/js/app.ui.js b/js/app.ui.js
index 971268c..ae549a3 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -314,8 +314,6 @@ App.Ui = null;
                        } else {
                                this.loadStartContent();
                        }
-                       $.mobile.activePage.page('refresh');
-                       $('#start, #content-start').css("min-height", 0);
                },
 
                /**
@@ -474,10 +472,6 @@ App.Ui = null;
                        $.mobile.changePage('#contact');
                },
 
-               disableSelections: function ui_disableSelections() {
-                       $.mobile.tizen.disableSelection(document);
-               },
-
                verticalCenter: function (obj) {
                        var marginTop = ($(window).height()
                                - $('[data-role=header]:visible').height()
@@ -531,7 +525,7 @@ App.Ui = null;
                                if (self.app.started) {
                                        self.loadStartPage();
                                }
-                               self.verticalCenter($('#startBox'));
+                               $('.box').hide();
                        });
 
                        $('#start').on('pageshow', function () {
@@ -539,13 +533,16 @@ App.Ui = null;
                                if (monit !== '' && monit !== undefined) {
                                        self.showPopup(obj.data('monit'), obj);
                                }
+                               self.verticalCenter($('.box'));
                        });
 
                        $('#start').one('pageshow', function () {
                                setTimeout(function () {
-                                       self.verticalCenter($('#startBox'));
-                               }, 20);
+                                       $("#content-start").css('min-height', 0);
+                                       self.verticalCenter($('.box'));
+                               }, 30);
                        });
+
                        $( "#contact-nfc-error" ).bind({
                                        popupafterclose: function(){
                                        tizen.application.getCurrentApplication().exit();
Domain: Applications / Uncategorized;