[widgetservice] fix bug in Widget.addStateChangeListener, wrong parameters

Change-Id: I85aa9b41f68430f113d1b50ed9a026313e88045f
Signed-off-by: jk.pu <jk.pu@samsung.com>

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 001bde7edc9d2280c9b703fe494850d252ddc2fb..23d63b8311ee6db3958eed41dd4802e5c60eb39d 100644 (file)
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -10,7 +10,7 @@
 %define crosswalk_extensions_path %{_libdir}/%{crosswalk_extensions}
 
 Name:       webapi-plugins
-Version:    1.42
+Version:    1.43
 Release:    0
 License:    Apache-2.0 and BSD-2.0 and MIT
 Group:      Development/Libraries

diff --git a/src/widgetservice/widgetservice_api.js b/src/widgetservice/widgetservice_api.js
old mode 100755 (executable)
new mode 100644 (file)
index fa358f4..e043c96
--- a/src/widgetservice/widgetservice_api.js
+++ b/src/widgetservice/widgetservice_api.js
@@ -110,7 +110,7 @@ function WidgetInstance(data, widget) {
       enumerable: true
     },
     id: {
-      value: data.id,
+      value: data,
       writable: false,
       enumerable: true
     },
@@ -326,7 +326,7 @@ function ListenerManager(native, listenerName) {
 
 ListenerManager.prototype.onListenerCalled = function(msg) {
   for (var watchId in this.listeners) {
-    if (this.listeners.hasOwnProperty(watchId) && this.listeners[watchId][msg.action]) {
+    if (this.listeners.hasOwnProperty(watchId) ) {
       this.listeners[watchId](this.native.getResultObject(msg));
     }
   }
@@ -369,7 +369,7 @@ Widget.prototype.addStateChangeListener = function() {
 
   var func = function(msg) {
     if (msg.widgetId === this.id) {
-      args.eventCallback(msg.instanceId, msg.event);
+      args.eventCallback(new WidgetInstance(msg, this), msg.event);
     }
   }.bind(this);
 

diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc
old mode 100755 (executable)
new mode 100644 (file)
index 3832981..c3c56c3
--- a/src/widgetservice/widgetservice_instance.cc
+++ b/src/widgetservice/widgetservice_instance.cc
@@ -125,7 +125,7 @@ int WidgetLifecycleCb(const char* widget_id, widget_lifecycle_event_e lifecycle_
   auto& obj = response.get<picojson::object>();
 
   obj.insert(std::make_pair(kWidgetId, picojson::value(widget_id)));
-  obj.insert(std::make_pair(kInstanceId, picojson::value(widget_instance_id)));
+  obj.insert(std::make_pair(kId, picojson::value(widget_instance_id)));
   obj.insert(std::make_pair(kEvent, picojson::value(WidgetServiceUtils::FromEventType(lifecycle_event))));
 
   instance->CallWidgetLifecycleListener(widget_id, response);