From: gs86.lee Date: Tue, 23 Apr 2013 08:47:39 +0000 (+0900) Subject: [ContactsExchanger]update ContactsExchanger(tizen_2.1) X-Git-Tag: 2.1b_release^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_2.1;p=samples%2Fweb%2FContactsExchanger.git [ContactsExchanger]update ContactsExchanger(tizen_2.1) Change-Id: I70edcd2a7b4abf3c50b8562ce3b3b74bc7898212 --- diff --git a/LICENSE.Flora b/LICENSE.Flora index 9c95663..fd90a36 100644 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +Version 1.0, April, 2013 http://floralicense.org/license/ @@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. "Tizen Certified Platform" shall mean a software platform that complies -with the standards set forth in the Compatibility Definition Document -and passes the Compatibility Test Suite as defined from time to time +with the standards set forth in the Tizen Compliance Specification +and passes the Tizen Compliance Tests as defined from time to time by the Tizen Technical Steering Group and certified by the Tizen Association or its designated agent. diff --git a/NOTICE.Flora b/NOTICE.Flora deleted file mode 100644 index fdb699a..0000000 --- a/NOTICE.Flora +++ /dev/null @@ -1,4 +0,0 @@ -Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE file for Flora License terms and conditions. - diff --git a/config.xml b/config.xml index 288176b..38e005c 100644 --- a/config.xml +++ b/config.xml @@ -1,42 +1,49 @@ - - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - + + + ContactsExchanger - - - - - - - - - - - + + + + + + + + + + + diff --git a/css/style.css b/css/style.css index 37b74db..6f676be 100644 --- a/css/style.css +++ b/css/style.css @@ -34,11 +34,14 @@ display: table-cell; vertical-align: middle; height: inherit; - width: 100%; - min-width: 296px; + width: 296px; text-align: center; } +#waitingBox { + display: none; +} + .gap { width: 100%; height: 10px; diff --git a/icon.png b/icon.png old mode 100755 new mode 100644 index 983c883..33fbb63 Binary files a/icon.png and b/icon.png differ diff --git a/js/app.ui.js b/js/app.ui.js index 21ea867..1f513ec 100644 --- a/js/app.ui.js +++ b/js/app.ui.js @@ -110,7 +110,7 @@ App.Ui = null; waitingBox.append(waitingContent); contentTransfer.append(waitingBox); $('#content-start').trigger('create'); - + $('#waitingBox').css("display", "table-cell"); this.app.countDown(10, $('#counter')); }, @@ -501,20 +501,25 @@ App.Ui = null; }); $('#transfer').on('pageshow', function () { - try { - var option = $(this).data('option'); - if (option === 'read') { - 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.app.nfc.card.setTagDetectWrite(); - } else { - self.prepareWaitingPage('Device to Device', 'PUT YOUR DEVICE
CLOSE TO
OTHER DEVICE'); - self.app.nfc.peer.setTargetDetect(); + if (tizen.nfc.getDefaultAdapter().powered) { + try { + var option = $(this).data('option'); + if (option === 'read') { + 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.app.nfc.card.setTagDetectWrite(); + } else { + self.prepareWaitingPage('Device to Device', 'PUT YOUR DEVICE
CLOSE TO
OTHER DEVICE'); + self.app.nfc.peer.setTargetDetect(); + } + } catch (e) { + console.error(e.message); } - } catch (e) { - console.error(e.message); + } else { + $.mobile.changePage('#start'); + alert('Please turn on NFC adapter'); } }); } diff --git a/js/main.js b/js/main.js index 1932e73..49c65d7 100644 --- a/js/main.js +++ b/js/main.js @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.tizenopensource.org/license + * http://floralicense.org/license * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS,