Skip to content

Commit 4264e5a

Browse files
author
Justin McPherson
committed
WIP
1 parent c52ffcd commit 4264e5a

8 files changed

Lines changed: 20 additions & 8 deletions

File tree

Libraries/AppStateIOS/AppStateIOS.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*/
1212
'use strict';
1313

14-
var warning = require('warning');
14+
var warning = require('fbjs/lib/warning');
1515

1616
class AppStateIOS {
1717

Libraries/Components/ToastAndroid/ToastAndroid.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
'use strict';
1212

13-
var warning = require('warning');
13+
var warning = require('fbjs/lib/warning');
1414

1515
var ToastAndroid = {
1616

Libraries/Network/XMLHttpRequest.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class XMLHttpRequest extends XMLHttpRequestBase {
4141
}
4242
this.status = status;
4343
this.setResponseHeaders(responseHeaders || {});
44-
this.responseText = responseText;
44+
this.response = responseText;
4545
this.setReadyState(this.DONE);
4646
}
4747
}

Libraries/ReactIOS/renderApplication.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var React = require('React');
88
var View = require('View');
99
var StyleSheet = require('StyleSheet');
1010

11-
var invariant = require('invariant');
11+
var invariant = require('fbjs/lib/invariant');
1212

1313
function renderApplication<D, P, S>(
1414
RootComponent: ReactClass<D, P, S>,

Libraries/Utilities/BackAndroid.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
'use strict';
1515

16-
var warning = require('warning');
16+
var warning = require('fbjs/lib/warning');
1717

1818
function platformWarn() {
1919
warning(false, 'BackAndroid is not supported on this platform.');

Libraries/Vibration/VibrationIOS.ubuntu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
'use strict';
1414

15-
var warning = require('warning');
15+
var warning = require('fbjs/lib/warning');
1616

1717
var VibrationIOS = {
1818
vibrate: function() {

ReactUbuntu/runtime/src/reactnetworking.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void ReactNetworking::sendRequest(
5353
const ReactNetworking::Callback& callback
5454
)
5555
{
56-
qDebug() << __PRETTY_FUNCTION__ << method << url;
56+
// qDebug() << __PRETTY_FUNCTION__ << method << url;
5757

5858
QNetworkRequest request(url);
5959

@@ -66,9 +66,13 @@ void ReactNetworking::sendRequest(
6666
if (method.compare("get", Qt::CaseInsensitive) == 0) {
6767
QNetworkReply* reply = m_nam->get(request);
6868
QObject::connect(reply, &QNetworkReply::finished, [=] {
69+
QVariantMap rh;
70+
for (auto& hp : reply->rawHeaderPairs()) {
71+
rh.insert(hp.first, hp.second);
72+
}
6973
callback(m_bridge,
7074
reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(),
71-
QVariantMap{},
75+
rh,
7276
reply->readAll());
7377
});
7478
m_activeConnections[requestId] = reply;

packager/blacklist.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ var platformBlacklists = {
3030
web: [
3131
'.ios.js',
3232
'.android.js',
33+
'.ubuntu.js',
3334
],
3435
ios: [
3536
'.web.js',
3637
'.android.js',
38+
'.ubuntu.js',
3739
],
3840
android: [
3941
'.web.js',
4042
'.ios.js',
43+
'.ubuntu.js',
4144
],
45+
ubuntu: [
46+
'.web.js',
47+
'.ios.js',
48+
'.android.js',
49+
]
4250
};
4351

4452
function escapeRegExp(pattern) {

0 commit comments

Comments
 (0)