Merge pull request #199 from pec1985/timob-14207

[TIMOB-14207] Fixed webview Ti events
appcelerator-archive · Dec 18, 2013 · 7045ca1 · 7045ca1
2 parents 9e777e9 + d27365e
commit 7045ca1
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 0 deletions.
diff --git a/src/tibb/Modules/App/TiAppModule.cpp b/src/tibb/Modules/App/TiAppModule.cpp
@@ -10,6 +10,8 @@
 #include <bb/ApplicationInfo>
 #include <bb/PackageInfo>
 
+#include "TiUIWebView.h"
+
 TiAppModule::TiAppModule(const char* name) : Ti::TiModule(name)
 {
 
@@ -49,6 +51,24 @@ TiAppModule::~TiAppModule()
 
 }
 
+void TiAppModule::fireEvent(QString eventName, Ti::TiEventParameters eventParams)
+{
+	Ti::TiProxy::fireEvent(eventName, eventParams);
+	QList<TiUIWebView*> webViews = TiUIWebView::getWebViews();
+	if(webViews.size() > 0)
+	{
+		Ti::TiEventParameters webViewEventParams;
+		webViewEventParams.addParam("data", eventParams);
+		webViewEventParams.addParam("id", eventName);
+
+		QString json = webViewEventParams.toJsonQString();
+		for(int i = 0, len = webViews.length(); i < len; i++)
+		{
+			webViews.at(i)->getNativeWebView()->postMessage(json);
+		}
+	}
+}
+
 Ti::TiValue TiAppModule::getModuleId()
 {
 	Ti::TiValue val;

diff --git a/src/tibb/Modules/App/TiAppModule.h b/src/tibb/Modules/App/TiAppModule.h
@@ -21,6 +21,8 @@ class TiAppModule : public Ti::TiModule
 	virtual Ti::TiValue getModuleVersion();
 	virtual Ti::TiValue getModuleName();
 
+	virtual void fireEvent(QString, Ti::TiEventParameters);
+
 	Ti::TiValue fireSystemEvent(Ti::TiValue);
 	Ti::TiValue getArguments(Ti::TiValue);
 

diff --git a/src/ticore/include/Ti_EventParameters.h b/src/ticore/include/Ti_EventParameters.h
@@ -30,6 +30,9 @@ class TiEventParameters {
 	void addParam(QString, TiProxy*);
 	void addParam(QString, TiEventParameters);
 	bool contains(QString);
+
+	QString toJsonQString();
+
 	static void addParametersToObject(Ti::TiEventParameters*, Handle<Object>);
 private:
 	QMap<QString, QString> stringMap;

diff --git a/src/ticore/src/Ti_EventParameters.cpp b/src/ticore/src/Ti_EventParameters.cpp
@@ -49,6 +49,61 @@ void Ti::TiEventParameters::addParam(QString key, TiEventParameters value)
 	objectMap[key] = value;
 }
 
+QString Ti::TiEventParameters::toJsonQString()
+{
+	QString json = "{";
+
+	foreach(QString key, stringMap.keys())
+	{
+		// "key":"value",
+		json.append("\"").append(key).append("\":\"").append(stringMap[key]).append("\",");
+	}
+
+	foreach(QString key, numberMap.keys())
+	{
+		// "key":"value",
+		json.append("\"").append(key).append("\":\"").append(QString::number(numberMap[key])).append("\",");
+	}
+
+	foreach(QString key, proxyMap.keys())
+	{
+		json.append("\"").append(key).append("\":\"").append(proxyMap[key]->getProxyName()).append("\",");
+	}
+
+	foreach(QString key, objectMap.keys())
+	{
+		json.append("\"").append(key).append("\":").append(
+				objectMap[key].toJsonQString()
+		).append(",");
+	}
+
+	/*
+	foreach(QString key, arrayMap.keys())
+	{
+		json.append("\"").append(key).append("\":");
+		json.append("[");
+		foreach(TiEventParameters params, arrayMap[key])
+		{
+			json.append(params.toJsonQString()).append(",");
+		}
+		if(json.endsWith(","))
+		{
+			json.chop(1);
+		}
+		json.append("],");
+	}
+	*/
+	if(json.endsWith(","))
+	{
+		json.chop(1);
+	}
+	json.append("}");
+
+	qDebug() << "[TiEventParameters]" << json;
+
+	return json;
+}
+
 void Ti::TiEventParameters::addParametersToObject(Ti::TiEventParameters* parameters, Handle<Object> object)
 {
 

diff --git a/src/ticore/src/Ti_Proxy.cpp b/src/ticore/src/Ti_Proxy.cpp
@@ -191,6 +191,16 @@ Ti::TiValue Ti::TiProxy::fireEvent(Ti::TiValue value)
 				{
 					eventParams.addParam(name, val.toProxy());
 				}
+				/*
+				else if (val.isList())
+				{
+					// TODO:
+				}
+				else if (val.isMap())
+				{
+					// TODO:
+				}
+				*/
 				else // if(val.isString())
 				{
 					eventParams.addParam(name, val.toString());