[NFC] Fix for manual tests.
authorTomasz Marciniak <t.marciniak@samsung.com>
Wed, 20 May 2015 12:39:55 +0000 (14:39 +0200)
committerHyunjin Park <hj.na.park@samsung.com>
Wed, 3 Jun 2015 04:56:33 +0000 (13:56 +0900)
[Verification] Code compiles without errors.
Manual tests NFCPeer_unsetReceiveNDEFListener and
NFCPeer_unsetReceiveNDEFListener_extra_argument pass.

Change-Id: Ieee6b2c3585d783508f4acf7168881a6285ad911
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
src/nfc/nfc_api.js

index 24adbc1..5ffd6ed 100644 (file)
@@ -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 = [];