From: Tomasz Marciniak Date: Wed, 20 May 2015 12:39:55 +0000 (+0200) Subject: [NFC] Fix for manual tests. X-Git-Tag: submit/tizen_mobile/20150603.064609^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8f4939c677ee585e01f9d92fcd6a14214435055d;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [NFC] Fix for manual tests. [Verification] Code compiles without errors. Manual tests NFCPeer_unsetReceiveNDEFListener and NFCPeer_unsetReceiveNDEFListener_extra_argument pass. Change-Id: Ieee6b2c3585d783508f4acf7168881a6285ad911 Signed-off-by: Tomasz Marciniak --- diff --git a/src/nfc/nfc_api.js b/src/nfc/nfc_api.js index 24adbc1..5ffd6ed 100644 --- a/src/nfc/nfc_api.js +++ b/src/nfc/nfc_api.js @@ -1121,54 +1121,54 @@ function NFCPeer(peerid) { }); }; - Object.defineProperties(this, { - isConnected: { - enumerable: true, - set: function() {}, - get: isConnectedGetter - } - }); -} + NFCPeer.prototype.setReceiveNDEFListener = function() { + xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.NFC_P2P); -NFCPeer.prototype.setReceiveNDEFListener = function() { - xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.NFC_P2P); + var args = validator_.validateArgs(arguments, [ + { + name: 'listener', + type: types_.FUNCTION + } + ]); - var args = validator_.validateArgs(arguments, [ - { - name: 'listener', - type: types_.FUNCTION - } - ]); + var listener = function(msg) { + var data = undefined; + if ('onsuccess' === msg.action && _my_id === msg.id) { + data = new NDEFMessage(msg); + } + args.listener[msg.action](data); + }; - var listener = function(msg) { - var data = undefined; - if ('onsuccess' === msg.action && this._my_id === msg.id) { - data = new NDEFMessage(msg); + var result = native_.callSync('NFCPeer_setReceiveNDEFListener', {'id' : _my_id}); + if (native_.isFailure(result)) { + throw native_.getErrorObject(result); } - args.listener[msg.action](data); - }; - var result = native_.callSync('NFCPeer_setReceiveNDEFListener', {'id' : this._my_id}); - if (native_.isFailure(result)) { - throw native_.getErrorObject(result); - } + native_.addListener(RECEIVE_NDEF_LISTENER, listener); + return; + }; - native_.addListener(RECEIVE_NDEF_LISTENER, listener); - return; -}; + NFCPeer.prototype.unsetReceiveNDEFListener = function() { + xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.NFC_P2P); -NFCPeer.prototype.unsetReceiveNDEFListener = function() { - xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.NFC_P2P); + native_.removeListener(RECEIVE_NDEF_LISTENER); - native_.removeListener(RECEIVE_NDEF_LISTENER); + var result = native_.callSync('NFCPeer_unsetReceiveNDEFListener', {'id' : _my_id}); + if (native_.isFailure(result)) { + throw native_.getErrorObject(result); + } - var result = native_.callSync('NFCPeer_unsetReceiveNDEFListener', {'id' : this._my_id}); - if (native_.isFailure(result)) { - throw native_.getErrorObject(result); - } + return; + }; - return; -}; + Object.defineProperties(this, { + isConnected: { + enumerable: true, + set: function() {}, + get: isConnectedGetter + } + }); +} var toByteArray = function(array, max_size, nullable) { var resultArray = [];