Dispatch DOM Event Support Bug Fix

[Issue#] N/A
[Problem] Inner "event" variable in dispatch_event_support overrides global scope variable.
[Cause] N/A
[Solution] Inner variable name was changed to "__event".

Change-Id: I00053cce7f66bc55d11038f6c669f894c223c006

diff --git a/src/dispatch-event/dispatch_event_support.cpp b/src/dispatch-event/dispatch_event_support.cpp
index 14aa01a..b73a2fb 100644 (file)
--- a/src/dispatch-event/dispatch_event_support.cpp
+++ b/src/dispatch-event/dispatch_event_support.cpp
@@ -62,16 +62,14 @@ void dispatchAppServiceEvent(JSContextRef context, const float scale, const std:
     {
         std::stringstream script;
 
-        script << "{\n"
-               << "    var event = document.createEvent(\"CustomEvent\");\n"
-               << "    event.initCustomEvent(\"appservice\", true, true);\n"
-               << "    event.scale = " << scale << ";\n"
-               << "    event.__bundle = \"" << bundle << "\";\n"
-               << "    document.dispatchEvent(event);\n"
-               << "    \n"
-               << "    for (var i=0; i < window.frames.length; i++)\n"
-               << "    { window.frames[i].document.dispatchEvent(event); }\n"
-               << "}";
+        script << "var __event = document.createEvent(\"CustomEvent\");\n"
+               << "__event.initCustomEvent(\"appservice\", true, true);\n"
+               << "__event.scale = " << scale << ";\n"
+               << "__event.__bundle = \"" << bundle << "\";\n"
+               << "document.dispatchEvent(__event);\n"
+               << "\n"
+               << "for (var i=0; i < window.frames.length; i++)\n"
+               << "{ window.frames[i].document.dispatchEvent(__event); }";
 
         // just for debugging
         // LogDebug("script :\n" << script.str());
@@ -95,17 +93,15 @@ void dispatchSoftKeyboardChangeEvent(JSContextRef context, const std::string sta
     {
         std::stringstream script;
 
-        script << "{\n"
-               << "    var event = document.createEvent(\"CustomEvent\");\n"
-               << "    event.initCustomEvent(\"softkeyboardchange\", true, true);\n"
-               << "    event.state = \"" << state << "\";\n"
-               << "    event.width = " << width << ";\n"
-               << "    event.height = " << height << ";\n"
-               << "    document.dispatchEvent(event);\n"
-               << "    \n"
-               << "    for (var i=0; i < window.frames.length; i++)\n"
-               << "    { window.frames[i].document.dispatchEvent(event); }\n"
-               << "}";
+        script << "var __event = document.createEvent(\"CustomEvent\");\n"
+               << "__event.initCustomEvent(\"softkeyboardchange\", true, true);\n"
+               << "__event.state = \"" << state << "\";\n"
+               << "__event.width = " << width << ";\n"
+               << "__event.height = " << height << ";\n"
+               << "document.dispatchEvent(__event);\n"
+               << "\n"
+               << "for (var i=0; i < window.frames.length; i++)\n"
+               << "{ window.frames[i].document.dispatchEvent(__event); }";
 
         // just for debugging
         // LogDebug("script :\n" << script.str());
@@ -129,19 +125,18 @@ void dispatchStorageEvent(JSContextRef context, const std::string key, const std
     {
         std::stringstream script;
 
-        script << "{\n"
-               << "    var event = document.createEvent(\"CustomEvent\");\n"
-               << "    event.initCustomEvent(\"storage\", true, true);\n"
-               << "    event.key = \"" << key << "\";\n"
-               << "    event.oldValue = \"" << oldValue << "\";\n"
-               << "    event.newValue = \"" << newValue << "\";\n"
-               << "    event.url = \"" << url << "\";\n"
-               << "    event.storageArea = widget.preferences;\n"
-               << "    document.dispatchEvent(event);\n"
-               << "    \n"
-               << "    for (var i=0; i < window.frames.length; i++)\n"
-               << "    { window.frames[i].document.dispatchEvent(event); }\n"
-               << "}";
+        script << "var __event = document.createEvent(\"CustomEvent\");\n"
+               << "__event.initCustomEvent(\"storage\", true, true);\n"
+               << "__event.key = \"" << key << "\";\n"
+               << "__event.oldValue = \"" << oldValue << "\";\n"
+               << "__event.newValue = \"" << newValue << "\";\n"
+               << "__event.url = \"" << url << "\";\n"
+               << "__event.storageArea = widget.preferences;\n"
+               << "document.dispatchEvent(__event);\n"
+               << "\n"
+               << "for (var i=0; i < window.frames.length; i++)\n"
+               << "{ window.frames[i].document.dispatchEvent(__event); }";
+
 
         // just for debugging
         // LogDebug("script :\n" << script.str());