Revert "[TVInputDevice] Register/unregister keys from mandatoryMap"

This reverts commit 4c95f7e1b4b33a603470f14e63c01bb5671241a1.

VD department's request : keep application backwardcompatibility

Change-Id: I24800147e47f496c1ecd99ba390d6f7ec0b66760

diff --git a/src/tvinputdevice/tvinputdevice_api.js b/src/tvinputdevice/tvinputdevice_api.js
index 94af4525a72cbafbb3fed627ec0f647bbb79963a..b2f34f1b73349d25561730ae0aa65fe881766819 100755 (executable)
--- a/src/tvinputdevice/tvinputdevice_api.js
+++ b/src/tvinputdevice/tvinputdevice_api.js
@@ -266,11 +266,7 @@ TVInputDeviceManager.prototype.getSupportedKeys = function() {
       re.push(new TVInputDeviceKey({name: key, code: map[key].keyCode}));
     }
   }
-  for (var key in mandatoryMap) {
-    if (mandatoryMap.hasOwnProperty(key)) {
-      re.push(new TVInputDeviceKey({name: key, code: mandatoryMap[key].keyCode}));
-      }
-  }
+
   return re;
 };
 
@@ -307,16 +303,12 @@ TVInputDeviceManager.prototype.registerKey = function(keyName) {
   var args = validator.validateArgs(arguments, [
     {name: 'keyName', type: types.STRING}
   ]);
-  if (!map[args.keyName] && !mandatoryMap[args.keyName]) {
+  if (!map[args.keyName]) {
     throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR,
     'Parameter "keyName" is invalid.');
   }
 
-  if (map[args.keyName]) {
-    var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/registerKey', map[args.keyName].keyName);
-  } else {
-    var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/registerKey', mandatoryMap[args.keyName].keyName);
-  }
+  var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/registerKey', map[args.keyName].keyName);
   if (ret === 'error') {
     throw new WebAPIException(WebAPIException.UNKNOWN_ERR, 'UnknownError');
   }
@@ -332,16 +324,13 @@ TVInputDeviceManager.prototype.unregisterKey = function(keyName) {
   var args = validator.validateArgs(arguments, [
     {name: 'keyName', type: types.STRING}
   ]);
-  if (!map[args.keyName] && !mandatoryMap[args.keyName]) {
+
+  if (!map[args.keyName]) {
     throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR,
     'Parameter "keyName" is invalid.');
   }
 
-  if (map[args.keyName]) {
-    var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/unregisterKey', map[args.keyName].keyName);
-  } else {
-    var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/unregisterKey', mandatoryMap[args.keyName].keyName);
-  }
+  var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/unregisterKey', map[args.keyName].keyName);
   if (ret === 'error') {
     throw new WebAPIException(WebAPIException.UNKNOWN_ERR, 'UnknownError');
   }
@@ -371,14 +360,11 @@ TVInputDeviceManager.prototype.registerKeyBatch = function() {
 
     var keysList = "";
     for (var i = 0; i < args.keyNames.length; ++i) {
-      if (map[args.keyNames[i]]) {
-        keysList += map[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
-      } else if (mandatoryMap[args.keyNames[i]]) {
-        keysList += mandatoryMap[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
-      } else {
+      if (!map[args.keyNames[i]]) {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR,
                                   'Invalid key name: "' + args.keyNames[i] + '"');
       }
+      keysList += map[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
     }
 
     setTimeout(function() {
@@ -416,14 +402,11 @@ TVInputDeviceManager.prototype.registerKeyBatch = function() {
 
     var keysList = "";
     for (var i = 0; i < args.keyNames.length; ++i) {
-      if (map[args.keyNames[i]]) {
-        keysList += map[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
-      } else if (mandatoryMap[args.keyNames[i]]) {
-        keysList += mandatoryMap[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
-      } else {
+      if (!map[args.keyNames[i]]) {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR,
                                   'Invalid key name: "' + args.keyNames[i] + '"');
       }
+      keysList += map[args.keyNames[i]].keyName + ((i < args.keyNames.length - 1) ? "," : "");
     }
 
     setTimeout(function() {