[ContactsExchanger] updated ContactsExchanger sources
authorMaciek Blim <m.blim@samsung.com>
Mon, 2 Sep 2013 12:35:54 +0000 (14:35 +0200)
committerMaciek Blim <m.blim@samsung.com>
Mon, 2 Sep 2013 12:35:54 +0000 (14:35 +0200)
Change-Id: Ie4e8af7423b44d07dd1a3208488110dca969f266

css/style.css
js/app.ui.js

index bcd38ca..dd6d3d7 100644 (file)
        line-height: 20px;
 }
 
+#content-start {
+       display: table;
+}
+
 #comment {
        left: 0px;
        margin: 0 auto;
@@ -37,6 +41,8 @@
        padding: 0 32px;
        width: 296px;
        text-align: center;
+       display: table-cell;
+       vertical-align: middle;
 }
 
 #waitingBox {
index 74c709c..53af89d 100644 (file)
@@ -92,7 +92,6 @@ App.Ui = null;
                        contentTransfer.append(waitingBox);
                        $('#content-start').trigger('create');
                        this.app.countDown(10, $('#counter'));
-                       this.verticalCenter($('#waitingBox'));
                },
 
                /**
@@ -461,16 +460,6 @@ App.Ui = null;
                        $.mobile.changePage('#contact');
                },
 
-               verticalCenter: function (obj) {
-                       var marginTop = ($(window).height()
-                               - $('[data-role=header]:visible').height()
-                               - $('[data-role=footer]:visible').height()
-                               - obj.outerHeight())/2;
-                       if (parseInt(obj.css('margin-top'), 10) !== marginTop) {
-                               obj.hide().css('margin-top', marginTop).show();
-                       }
-               },
-
                defineEvents: function ui_defineEvents() {
                        var self = this;
 
@@ -514,7 +503,6 @@ App.Ui = null;
                                if (self.app.started) {
                                        self.loadStartPage();
                                }
-                               $('.box').hide();
                        });
 
                        $('#start').on('pageshow', function () {
@@ -523,17 +511,6 @@ App.Ui = null;
                                        self.showPopup(obj.data('monit'));
                                        obj.data('monit', '');
                                }
-                               self.verticalCenter($('.box'));
-                               setTimeout(function () {
-                                       self.verticalCenter($('.box'));
-                               }, 30);
-                       });
-
-                       $('#start').one('pageshow', function () {
-                               setTimeout(function () {
-                                       $("#content-start").css('min-height', 0);
-                                       self.verticalCenter($('.box'));
-                               }, 30);
                        });
 
                        $( "#contact-nfc-error" ).bind({