From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Fri, 16 Oct 2015 13:25:39 +0000 (+0200)
Subject: [Application] Change parameter type in EventCallback
X-Git-Tag: submit/tizen/20151026.073646^2^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e59df6472707cdd1601ad3f00d1eda9839eaa376;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Application] Change parameter type in EventCallback

[Features] Commit migrated from tv branch.
http://165.213.149.170/gerrit/#/c/75749/

[Verification] Code compiles. TCT 100%

Change-Id: Id925df7a26af620492b458e5cf98ba49149a5ff0
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---

diff --git a/src/application/application_api.js b/src/application/application_api.js
index aa85201b..e8b00eef 100755
--- a/src/application/application_api.js
+++ b/src/application/application_api.js
@@ -685,19 +685,22 @@ Application.prototype.addEventListener = function(event, callback) {
   if (!Object.keys(event_listeners_[data.name]).length) {
     native.addListener(data.name, function(msg) {
       var eventName = msg.name;
-      var event = eventName.split('.');
-      event = {
-        appId: event.slice(1, -1).join('.'), // app ID is everything besides the 'event' prefix and event name
-        name: event[event.length - 1]  // event name cannot contain '.', so it's always the last element in array
-      };
+      var parsedName = eventName.split('.');
+      var eventInfo = {};
+      if (parsedName.length < 3) {
+        console.logd('Invalid event name returned' + eventName);
+      }
       for (var id in event_listeners_[eventName]) {
         if (event_listeners_[eventName].hasOwnProperty(id)) {
           if (msg.data) {
-            event_listeners_[eventName][id](event, msg.data);
+            eventInfo.appId = parsedName[1];
+            eventInfo.name = parsedName[2];
+            event_listeners_[eventName][id](eventInfo, msg.data);
           } else {
             delete msg.name;
-            msg.type = event; //TODO: type should come from native site
-            event_listeners_[eventName][id](event, msg);
+            msg.type = parsedName[2]; //TODO: type should come from native site
+            eventInfo.name = parsedName[2].toUpperCase();
+            event_listeners_[eventName][id](eventInfo, msg);
           }
         }
       }