RockWork

Merge lp:~bhdouglass/rockwork/onreadystatechange into lp:rockwork

  1. onreadystatechange
  2. Merge into trunk
Proposed by Brian Douglass
Status: Merged
Merged at revision: 85
Proposed branch: lp:~bhdouglass/rockwork/onreadystatechange
Merge into: lp:rockwork
Diff against target: 64 lines (+22/-0)
2 files modified
rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp (+18/-0)
rockworkd/libpebble/jskit/jskitxmlhttprequest.h (+4/-0)
To merge this branch: bzr merge lp:~bhdouglass/rockwork/onreadystatechange
Reviewer Review Type Date Requested Status
Michael Zanetti Pending
Review via email: mp+285432@code.launchpad.net

Description of the change

Implemented the onreadystatechange from the Sailfish app's code.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp'
2--- rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp 2016-02-08 06:46:15 +0000
3+++ rockworkd/libpebble/jskit/jskitxmlhttprequest.cpp 2016-02-09 05:30:42 +0000
4@@ -127,6 +127,16 @@
5 m_onload = value;
6 }
7
8+QJSValue JSKitXMLHttpRequest::onreadystatechange() const
9+{
10+ return m_onreadystatechange;
11+}
12+
13+void JSKitXMLHttpRequest::setOnreadystatechange(const QJSValue &value)
14+{
15+ m_onreadystatechange = value;
16+}
17+
18 QJSValue JSKitXMLHttpRequest::ontimeout() const
19 {
20 return m_ontimeout;
21@@ -259,6 +269,14 @@
22 } else {
23 qCDebug(l) << "No onload set";
24 }
25+
26+ if (m_onreadystatechange.isCallable()) {
27+ qCDebug(l) << "going to call onreadystatechange handler:" << m_onreadystatechange.toString();
28+ QJSValue result = m_onreadystatechange.callWithInstance(m_engine->newQObject(this));
29+ if (result.isError()) {
30+ qCWarning(l) << "JS error on onreadystatechange handler:" << JSKitManager::describeError(result);
31+ }
32+ }
33 }
34
35 void JSKitXMLHttpRequest::handleReplyError(QNetworkReply::NetworkError code)
36
37=== modified file 'rockworkd/libpebble/jskit/jskitxmlhttprequest.h'
38--- rockworkd/libpebble/jskit/jskitxmlhttprequest.h 2016-02-08 04:47:39 +0000
39+++ rockworkd/libpebble/jskit/jskitxmlhttprequest.h 2016-02-09 05:30:42 +0000
40@@ -12,6 +12,7 @@
41 QLoggingCategory l;
42
43 Q_PROPERTY(QJSValue onload READ onload WRITE setOnload)
44+ Q_PROPERTY(QJSValue onreadystatechange READ onreadystatechange WRITE setOnreadystatechange)
45 Q_PROPERTY(QJSValue ontimeout READ ontimeout WRITE setOntimeout)
46 Q_PROPERTY(QJSValue onerror READ onerror WRITE setOnerror)
47 Q_PROPERTY(uint readyState READ readyState NOTIFY readyStateChanged)
48@@ -41,6 +42,8 @@
49
50 QJSValue onload() const;
51 void setOnload(const QJSValue &value);
52+ QJSValue onreadystatechange() const;
53+ void setOnreadystatechange(const QJSValue &value);
54 QJSValue ontimeout() const;
55 void setOntimeout(const QJSValue &value);
56 QJSValue onerror() const;
57@@ -85,6 +88,7 @@
58 QString m_responseType;
59 QByteArray m_response;
60 QJSValue m_onload;
61+ QJSValue m_onreadystatechange;
62 QJSValue m_ontimeout;
63 QJSValue m_onerror;
64 };

Subscribers

People subscribed via source and target branches