Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 09:33:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

incremental request module fixes

Browse source
This commit is contained in:
CFresquet 2017-05-03 07:35:30 -07:00
parent 15db80c8ba
commit b54ea63af7
3 changed files with 10 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/makeUserConnection.js
View file

@ -14,7 +14,8 @@
(function() { // BEGIN LOCAL_SCOPE
var request = Script.require('../modules/request.js').request;
var REQUEST_URL = Script.resolvePath('request.js');
var request = Script.require(REQUEST_URL).request;
var LABEL = "makeUserConnection";
var MAX_AVATAR_DISTANCE = 0.2; // m

3
scripts/system/pal.js
View file

@ -14,7 +14,8 @@
(function() { // BEGIN LOCAL_SCOPE
var request = Script.require('../modules/request.js').request;
var REQUEST_URL = Script.resolvePath('request.js');
var request = Script.require(REQUEST_URL).request;
var populateNearbyUserList, color, textures, removeOverlays,
controllerComputePickRay, onTabletButtonClicked, onTabletScreenChanged,

54
scripts/system/tablet-goto.js
View file

@ -14,6 +14,10 @@
//
(function () { // BEGIN LOCAL_SCOPE
var REQUEST_URL = Script.resolvePath('request.js');
var request = Script.require(REQUEST_URL).request;
var gotoQmlSource = "TabletAddressDialog.qml";
var buttonName = "GOTO";
var onGotoScreen = false;
@ -30,54 +34,7 @@
text: buttonName,
sortOrder: 8
});
function request(options, callback) { // cb(error, responseOfCorrectContentType) of url. A subset of npm request.
var httpRequest = new XMLHttpRequest(), key;
// QT bug: apparently doesn't handle onload. Workaround using readyState.
httpRequest.onreadystatechange = function () {
var READY_STATE_DONE = 4;
var HTTP_OK = 200;
if (httpRequest.readyState >= READY_STATE_DONE) {
var error = (httpRequest.status !== HTTP_OK) && httpRequest.status.toString() + ':' + httpRequest.statusText,
response = !error && httpRequest.responseText,
contentType = !error && httpRequest.getResponseHeader('content-type');
if (!error && contentType.indexOf('application/json') === 0) { // ignoring charset, etc.
try {
response = JSON.parse(response);
} catch (e) {
error = e;
}
}
callback(error, response);
}
};
if (typeof options === 'string') {
options = {uri: options};
}
if (options.url) {
options.uri = options.url;
}
if (!options.method) {
options.method = 'GET';
}
if (options.body && (options.method === 'GET')) { // add query parameters
var params = [], appender = (-1 === options.uri.search('?')) ? '?' : '&';
for (key in options.body) {
params.push(key + '=' + options.body[key]);
}
options.uri += appender + params.join('&');
delete options.body;
}
if (options.json) {
options.headers = options.headers || {};
options.headers["Content-type"] = "application/json";
options.body = JSON.stringify(options.body);
}
for (key in options.headers || {}) {
httpRequest.setRequestHeader(key, options.headers[key]);
}
httpRequest.open(options.method, options.uri, true);
httpRequest.send(options.body);
}
function fromQml(message) {
var response = {id: message.id, jsonrpc: "2.0"};
switch (message.method) {
@ -99,6 +56,7 @@
// No need for a different activeIcon, because we issue messagesWaiting(false) when the button goes active anyway.
});
}
var hasEventBridge = false;
function wireEventBridge(on) {
if (on) {