diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2013-03-28 16:56:24 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-11-01 13:57:50 +0100 |
| commit | 7fc97a8a759f1df2fee910b6736ae27228111311 (patch) | |
| tree | 3e919cca0a5a28a6acbd7efdbfbf4bf7842dcfc4 /src | |
| parent | f87c2bec8de9d6ba84f6c03655cd71851592092a (diff) | |
| download | qtwebchannel-7fc97a8a759f1df2fee910b6736ae27228111311.tar.gz | |
Gracefully handle requests/responses without data.
Change-Id: I269ded913b25bb3d3869f2da85ce0ff7449b534b
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/MetaObjectPublisher.qml | 2 | ||||
| -rw-r--r-- | src/qobject.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/MetaObjectPublisher.qml b/src/MetaObjectPublisher.qml index 2d4ead1..6ac588c 100644 --- a/src/MetaObjectPublisher.qml +++ b/src/MetaObjectPublisher.qml @@ -56,7 +56,7 @@ MetaObjectPublisherImpl */ function handleRequest(data, webChannel) { - var message = JSON.parse(data); + var message = typeof(data) === "string" ? JSON.parse(data) : data; if (!message.data) { return false; } diff --git a/src/qobject.js b/src/qobject.js index fe0f54e..d221525 100644 --- a/src/qobject.js +++ b/src/qobject.js @@ -64,7 +64,7 @@ function QObject(name, data, webChannel) } webChannel.exec({"type": "Qt.invokeMethod", "object": object.__id__, "method": method, "args": args}, function(response) { - if (response.length && callback) { + if ((response != undefined) && callback) { (callback)(response); } }); |