Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 12:43:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add arraybuffer binary data handling in JavaScript XMLHttpRequest

Browse source
This commit is contained in:
David Rowe 2014-07-19 23:27:36 -07:00
parent 33ffed7135
commit d05435db91
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/script-engine/src/XMLHttpRequestClass.cpp
View file

@ -194,10 +194,10 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a
}
void XMLHttpRequestClass::send() {
send(QString::Null());
send(QString());
}
void XMLHttpRequestClass::send(const QString& data) {
void XMLHttpRequestClass::send(const QVariant& data) {
if (_readyState == OPENED && !_reply) {
if (!data.isNull()) {
if (_url.isLocalFile()) {
@ -205,7 +205,12 @@ void XMLHttpRequestClass::send(const QString& data) {
return;
} else {
_sendData = new QBuffer(this);
_sendData->setData(data.toUtf8());
if (_responseType == "arraybuffer") {
QByteArray ba = qvariant_cast<QByteArray>(data);
_sendData->setData(ba);
} else {
_sendData->setData(data.toString().toUtf8());
}
}
}
@ -274,7 +279,7 @@ void XMLHttpRequestClass::requestFinished() {
_responseData = QScriptValue::NullValue;
}
} else if (_responseType == "arraybuffer") {
_responseData = QScriptValue(_rawResponseData.data());
_responseData = _engine->newVariant(QVariant::fromValue(_rawResponseData));
} else {
_responseData = QScriptValue(QString(_rawResponseData.data()));
}

2
libraries/script-engine/src/XMLHttpRequestClass.h
View file

@ -84,7 +84,7 @@ public slots:
void open(const QString& method, const QString& url, bool async = true, const QString& username = "",
const QString& password = "");
void send();
void send(const QString& data);
void send(const QVariant& data);
QScriptValue getAllResponseHeaders() const;
QScriptValue getResponseHeader(const QString& name) const;