[ContactsExchanger] updated ContactsExchanger sources

Change-Id: Ie0eeb0cb3baf5540750db64e9118089fa78c573d

diff --git a/css/style.css b/css/style.css
index 97c62b5..110629c 100644 (file)
--- a/css/style.css
+++ b/css/style.css
@@ -134,4 +134,3 @@
        padding: 0 0.5909090909090909rem !important;
        margin: 0 !important;
 }
-

diff --git a/js/app.js b/js/app.js
index c246916..b5965cd 100644 (file)
--- a/js/app.js
+++ b/js/app.js
@@ -37,6 +37,7 @@ var app = null;
                addressBook: null,
                started: false,
                timeOutHandler: null,
+               counterState: true,
                nfc: null,
 
                init: function appInit() {
@@ -123,6 +124,13 @@ var app = null;
                },
 
                countDown: function countDown(time, obj) {
+                       if (!this.counterState) {
+                               setTimeout(function () {
+                                       this.countDown(time, obj);
+                               }.bind(this), 500);
+                               return;
+                       }
+
                        obj.text(time);
                        if (time > 0) {
                                if (this.nfc.isPowered()) {

diff --git a/js/app.ui.js b/js/app.ui.js
index ae549a3..f4716a0 100644 (file)
--- a/js/app.ui.js
+++ b/js/app.ui.js
@@ -326,8 +326,10 @@ App.Ui = null;
                        var html;
                        html = '<li class="ui-li-multiline">'
                                + '<a href="#">'
-                               + ((value === '' || value === 'null') ? '...' : value)
-                               + '<span class="ui-li-text-sub">' + label + '</span>'
+                               + '<span>' + label + '</span>'
+                               + '<span class="ui-li-text-sub">'
+                               + ((!value) ? '...' : value)
+                               + '</span>'
                                + '</a>'
                                + '</li>';
                        return html;
@@ -564,6 +566,9 @@ App.Ui = null;
                                        if ($.mobile.activePage.attr('id') === "choose") {
                                                $.mobile.activePage.trigger('pageshow');
                                        }
+                                       app.counterState = true;
+                               } else {
+                                       app.counterState = false;
                                }
                        });