wassname/Mostly-Harmless
1
0
Fork 0
mirror of https://github.com/wassname/Mostly-Harmless.git synced 2026-08-11 11:13:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

apiTransmit is now asynchronous.

Browse Source 
Todo: Convert previously procedural invocations to callbacks.
This commit is contained in:
Kerrick Long
2011-07-15 19:20:41 -05:00
parent e38c0ffbf2
commit 13a56bbe83
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/common.js
+32 -15
View File
@@ -255,22 +255,39 @@ function RedditAPI(domain) {
* @method
*/
RedditAPI.prototype.apiTransmit = function (type, url, data, cback) {
var req;
var req, apiTimeout;
req = new XMLHttpRequest();
req.open(type, url, false);
req.send(data);
if (req.status !== 200) {
console.warn(req);
throw 'Error loading API.\nURL: ' + url + '\nStatus: ' + req.status.toString();
} else if (JSON.parse(req.responseText).jquery && JSON.parse(req.responseText).jquery[3][3][0] === '.error.USER_REQUIRED') {
console.warn(req);
throw 'Error doing API action.\nURL: ' + url + '\nUser not logged in.';
function processResponse () {
if (req.readyState === 4) {
if (req.status === 200) {
if (JSON.parse(req.responseText).jquery && JSON.parse(req.responseText).jquery[3][3][0] === '.error.USER_REQUIRED') {
throw 'You have to be logged in to do that. <a href="http://www.reddit.com/login" target="_blank">Click to open the login page.</a>';
}
clearTimeout(apiTimeout);
if (cback) {
cback(JSON.parse(req.responseText));
}
return JSON.parse(req.responseText);
} else {
throw 'API Error. HTTP Status: ' + req.status + '. Try again?';
}
}
}
return JSON.parse(req.responseText);
function handleTimeout () {
req.abort();
throw 'API Timeout after ' + settings.get('timeoutLength') + ' seconds. Click to try again.';
}
req = new XMLHttpRequest();
req.open(type, url, true);
req.onreadystatechange = processResponse;
req.send(data);
if (settings.get('timeoutLength') !== 16) {
apiTimeout = setTimeout(handleTimeout, settings.get('timeoutLength') * 1000);
}
};
@@ -285,7 +302,7 @@ RedditAPI.prototype.apiTransmit = function (type, url, data, cback) {
RedditAPI.prototype.getInfo = function (url, tabId) {
var apiTimeout, isCommentsPage, reqUrl, req, postsObj, postCount;
function processInfo () {
function processResponse () {
if (req.readyState === 4) {
if (req.status === 200) {
var response;
@@ -340,7 +357,7 @@ RedditAPI.prototype.getInfo = function (url, tabId) {
req = new XMLHttpRequest();
req.open('GET', reqUrl, true);
req.onreadystatechange = processInfo;
req.onreadystatechange = processResponse;
req.send(null);
if (settings.get('timeoutLength') !== 16) {
apiTimeout = setTimeout(handleTimeout, settings.get('timeoutLength') * 1000);