diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:11:16 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 09:11:16 +0100 |
| commit | 8f014f0915c7bdc97573f953aa9a3ae25a5f953a (patch) | |
| tree | 3a7802c954ba9374dc83f91038a885fc2ddf4118 /rockworkd/libpebble/jskit/jskitpebble.cpp | |
| parent | c177b720be89b9bae5b643caa9e84c132ec8f869 (diff) | |
Rockwork 1.0
Diffstat (limited to 'rockworkd/libpebble/jskit/jskitpebble.cpp')
| -rw-r--r-- | rockworkd/libpebble/jskit/jskitpebble.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/rockworkd/libpebble/jskit/jskitpebble.cpp b/rockworkd/libpebble/jskit/jskitpebble.cpp index a300aef..e755d60 100644 --- a/rockworkd/libpebble/jskit/jskitpebble.cpp +++ b/rockworkd/libpebble/jskit/jskitpebble.cpp @@ -4,6 +4,7 @@ #include "jskitpebble.h" #include "jskitxmlhttprequest.h" +#include "jskitwebsocket.h" static const char *token_salt = "0feeb7416d3c4546a19b04bccd8419b1"; @@ -315,10 +316,16 @@ void JSKitPebble::openURL(const QUrl &url) QJSValue JSKitPebble::createXMLHttpRequest() { JSKitXMLHttpRequest *xhr = new JSKitXMLHttpRequest(m_mgr->engine()); - // Should be deleted by JS engine. return m_mgr->engine()->newQObject(xhr); } +QJSValue JSKitPebble::createWebSocket(const QString &url, const QJSValue &protocols) +{ + JSKitWebSocket *ws = new JSKitWebSocket(m_mgr->engine(), url, protocols); + return m_mgr->engine()->newQObject(ws); +} + + QJSValue JSKitPebble::buildAckEventObject(uint transaction, const QString &message) const { QJSEngine *engine = m_mgr->engine(); |
