From bc4b382dcb50ebc3427ad053c8eeb6f17947e0c8 Mon Sep 17 00:00:00 2001 From: "ji.ji" Date: Tue, 9 Jul 2013 19:20:26 +0900 Subject: [PATCH] [ContactsExchanger]Updated Private -> RSA Change-Id: I0ebffe123c4e8438afeba5786dad161b4ace6cfd --- config.xml | 2 +- css/style.css | 17 +++++++++++++---- index.html | 22 ++++++++++------------ js/app.js | 3 ++- js/app.ui.js | 46 +++++++++++++++++++++++++++++----------------- 5 files changed, 55 insertions(+), 35 deletions(-) diff --git a/config.xml b/config.xml index da81183..35fa3a7 100644 --- a/config.xml +++ b/config.xml @@ -27,7 +27,7 @@ - ContactsExchanger + Contacts exchanger diff --git a/css/style.css b/css/style.css index 6f676be..9b8d148 100644 --- a/css/style.css +++ b/css/style.css @@ -31,9 +31,6 @@ .box { margin: 0px; padding: 0 32px; - display: table-cell; - vertical-align: middle; - height: inherit; width: 296px; text-align: center; } @@ -77,6 +74,14 @@ font-weight: bold; } +#comment-phone { + color: #85837E; + white-space: nowrap; + width: 300px; + line-height: 20px; + overflow: hidden; + text-overflow: ellipsis; +} #accept-choose { width: auto; } @@ -113,9 +118,13 @@ } #list-choose li.selected { background-color: #ccc; + margin-top: -1px; } .ui-content { padding: 0; } -} \ No newline at end of file + +.ui-btn-back { + visibility:hidden; +} diff --git a/index.html b/index.html index 4fbb56c..6741486 100644 --- a/index.html +++ b/index.html @@ -12,19 +12,19 @@ - - - - - - - + + + + + + + -
+

Contacts exchanger

@@ -32,14 +32,12 @@
-
+

Contacts list

- -
@@ -50,7 +48,7 @@
-
+

Add contact

Save diff --git a/js/app.js b/js/app.js index 0c6ef90..9e1b8ad 100644 --- a/js/app.js +++ b/js/app.js @@ -46,7 +46,6 @@ var app = null; this.ui.disableSelections(); this.ui.defineEvents(); - this.ui.fixContentHeight(); this.initAddressBook(); this.nfc.startNFC(); }, @@ -55,6 +54,7 @@ var app = null; var elementSelected = $('#list-choose li.selected'); localStorage.started = true; localStorage.id = elementSelected.data('id'); + localStorage.caller = elementSelected.data('caller'); localStorage.firstName = elementSelected.data('firstName'); localStorage.lastName = elementSelected.data('lastName'); localStorage.phoneNumber = elementSelected.data('phoneNumber'); @@ -142,6 +142,7 @@ var app = null; try { contact = new tizen.Contact({ name: new tizen.ContactName({ + caller: data.caller, firstName: data.first, lastName: data.last }), diff --git a/js/app.ui.js b/js/app.ui.js index ab021f8..52fb5a4 100644 --- a/js/app.ui.js +++ b/js/app.ui.js @@ -110,8 +110,9 @@ App.Ui = null; waitingBox.append(waitingContent); contentTransfer.append(waitingBox); $('#content-start').trigger('create'); - $('#waitingBox').css("display", "table-cell"); this.app.countDown(10, $('#counter')); + this.verticalCenter($('#waitingBox')); + $('#waitingBox').show(); }, /** @@ -164,14 +165,14 @@ App.Ui = null; * @param {string} lastName * @returns {string} */ - getCommentHtml: function ui_getCommentHtml(firstName, lastName) { - var html = '
' + getCommentHtml: function ui_getCommentHtml(data) { + return '
' + '

Your default contact

' + '

' - + (firstName || '') + ' ' + (lastName || '') - + '

' + + data.caller + '

' + + '

' + + data.phoneNumber + '

' + '
'; - return html; }, /** @@ -285,7 +286,7 @@ App.Ui = null; contentStart = $('#content-start'); startBox = $('
'); gap = $('
'); - comment = $(this.getCommentHtml(localStorage.firstName, localStorage.lastName)); + comment = $(this.getCommentHtml(localStorage)); contentStart.empty(); startBox @@ -308,6 +309,7 @@ App.Ui = null; } else { this.loadStartContent(); } + $.mobile.activePage.page('refresh'); }, /** @@ -423,6 +425,7 @@ App.Ui = null; if (contact.phoneNumber !== '') { listElement = $(this.getContactsListElement(contact)); listElement + .data('caller', contact.caller) .data('firstName', contact.firstName) .data('lastName', contact.lastName) .data('phoneNumber', contact.phoneNumber) @@ -469,12 +472,14 @@ App.Ui = null; $.mobile.tizen.disableSelection(document); }, - /** - * Fix for height of the content area - */ - fixContentHeight: function fixContentHeight() { - var contentHeight = screen.availHeight - $('div[data-role="header"]').outerHeight() - $('div[data-role="footer"]').outerHeight(); - $('div[data-role="content"]').css('height', contentHeight); + 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() { @@ -527,6 +532,13 @@ App.Ui = null; if (monit !== '' && monit !== undefined) { self.showPopup(obj.data('monit'), obj); } + self.verticalCenter($('#startBox')); + }); + + $('#start').one('pageshow', function () { + setTimeout(function () { + self.verticalCenter($('#startBox')); + }, 20); }); document.addEventListener('tizenhwkey', function(e) { @@ -534,7 +546,7 @@ App.Ui = null; if ($.mobile.activePage.attr('id') === 'start') { tizen.application.getCurrentApplication().exit(); } else { - history.back(); + self.app.nfc.timeExpired(); } } }); @@ -544,13 +556,13 @@ App.Ui = null; try { var option = $(this).data('option'); if (option === 'read') { - self.prepareWaitingPage('Card to Device', 'PUT WIRELESS TAG
CLOSE TO
YOUR DEVICE'); + self.prepareWaitingPage('Card to device', 'PUT WIRELESS TAG
CLOSE TO
YOUR DEVICE'); self.app.nfc.card.setTagDetectRead(); } else if (option === 'write') { - self.prepareWaitingPage('Device to Card', 'PUT WIRELESS TAG
CLOSE TO
YOUR DEVICE'); + self.prepareWaitingPage('Device to card', 'PUT WIRELESS TAG
CLOSE TO
YOUR DEVICE'); self.app.nfc.card.setTagDetectWrite(); } else { - self.prepareWaitingPage('Device to Device', 'PUT YOUR DEVICE
CLOSE TO
OTHER DEVICE'); + self.prepareWaitingPage('Device to device', 'PUT YOUR DEVICE
CLOSE TO
OTHER DEVICE'); self.app.nfc.peer.setTargetDetect(); } } catch (e) { -- 2.7.4