# HG changeset patch # User Matti Hamalainen # Date 1395017630 -7200 # Node ID 5a433ea98f766e60b59d9cd77698685005a8260f # Parent 08b2cc0350d04cfe80680cbb585bc02d137e8357 Cleanups. diff -r 08b2cc0350d0 -r 5a433ea98f76 lib/util.js --- a/lib/util.js Mon Mar 17 02:48:13 2014 +0200 +++ b/lib/util.js Mon Mar 17 02:53:50 2014 +0200 @@ -1,39 +1,49 @@ -function XCreateXmlHTTPRequest() { +function XCreateXmlHTTPRequest() +{ try { - if (typeof ActiveXObject != 'undefined') { + if (typeof ActiveXObject != 'undefined') return new ActiveXObject('Microsoft.XMLHTTP'); - } else if (window["XMLHttpRequest"]) { + else + if (window["XMLHttpRequest"]) return new XMLHttpRequest(); - } - } catch (e) { + } + catch (e) { changeStatus(e); } return null; -}; +} + -function XDownloadUrl(url, callback) { +function XDownloadUrl(url, callback) +{ var status = -1; var request = XCreateXmlHTTPRequest(); if (!request) return false; - request.onreadystatechange = function() { - if (request.readyState == 4) { + request.onreadystatechange = function() + { + if (request.readyState == 4) + { try { status = request.status; - } catch (e) { + } + catch (e) { // Usually indicates request timed out in FF. } - if (status == 200) { + if (status == 200) + { callback(request.responseText, request.status); request.onreadystatechange = function() {}; } } } + request.open('GET', url, true); try { request.send(null); - } catch (e) { + } + catch (e) { changeStatus(e); } -}; +}