From 62b7d8c1ea8cb8a979c341ebfbf91ad14109b8d1 Mon Sep 17 00:00:00 2001
From: DanyaPostfactum <danya.postfactum@gmail.com>
Date: Wed, 6 Feb 2013 13:01:44 +1000
Subject: [PATCH] Strip legacy xhr code out of lib/net

---
 lib/ace/edit_session.js     |  1 -
 lib/ace/lib/event.js        |  6 +++---
 lib/ace/lib/net.js          | 42 ++++++-------------------------------
 lib/ace/virtual_renderer.js |  1 -
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 9ac41352..30f7ca64 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -34,7 +34,6 @@ define(function(require, exports, module) {
 var config = require("./config");
 var oop = require("./lib/oop");
 var lang = require("./lib/lang");
-var net = require("./lib/net");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var Selection = require("./selection").Selection;
 var TextMode = require("./mode/text").Mode;
diff --git a/lib/ace/lib/event.js b/lib/ace/lib/event.js
index 06574425..37cb7846 100644
--- a/lib/ace/lib/event.js
+++ b/lib/ace/lib/event.js
@@ -301,10 +301,10 @@ if (window.postMessage && !useragent.isOldIE) {
 
 
 exports.nextFrame = window.requestAnimationFrame ||
-    window.oRequestAnimationFrame ||
-    window.msRequestAnimationFrame ||
     window.mozRequestAnimationFrame ||
-    window.webkitRequestAnimationFrame;
+    window.webkitRequestAnimationFrame ||
+    window.msRequestAnimationFrame ||
+    window.oRequestAnimationFrame;
 
 if (exports.nextFrame)
     exports.nextFrame = exports.nextFrame.bind(window);
diff --git a/lib/ace/lib/net.js b/lib/ace/lib/net.js
index bdb01ab6..e125582e 100644
--- a/lib/ace/lib/net.js
+++ b/lib/ace/lib/net.js
@@ -8,12 +8,10 @@
 define(function(require, exports, module) {
 "use strict";
 
-var useragent = require("./useragent");
-
 exports.get = function (url, callback) {
-    var xhr = exports.createXhr();
+    var xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
-    xhr.onreadystatechange = function (evt) {
+    xhr.onreadystatechange = function () {
         //Do not explicitly handle errors, those should be
         //visible via console output in the browser.
         if (xhr.readyState === 4) {
@@ -23,47 +21,19 @@ exports.get = function (url, callback) {
     xhr.send(null);
 };
 
-var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
-
-exports.createXhr = function() {
-    //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
-    var xhr, i, progId;
-    if (typeof XMLHttpRequest !== "undefined") {
-        return new XMLHttpRequest();
-    } else {
-        for (i = 0; i < 3; i++) {
-            progId = progIds[i];
-            try {
-                xhr = new ActiveXObject(progId);
-            } catch (e) {}
-
-            if (xhr) {
-                progIds = [progId];  // so faster next time
-                break;
-            }
-        }
-    }
-
-    if (!xhr) {
-        throw new Error("createXhr(): XMLHttpRequest not available");
-    }
-
-    return xhr;
-};
-
 exports.loadScript = function(path, callback) {
-    var head = document.getElementsByTagName('head')[0];
+    var head = document.head || document.getElementsByTagName('head')[0];
     var s = document.createElement('script');
 
     s.src = path;
     head.appendChild(s);
 
-    if (useragent.isOldIE)
+    if (s.onload !== undefined)
+        s.onload = callback;
+    else
         s.onreadystatechange = function () {
             this.readyState == 'loaded' && callback();
         };
-    else
-        s.onload = callback;
 };
 
 });
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 6192b133..6d4afcb5 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -36,7 +36,6 @@ var dom = require("./lib/dom");
 var event = require("./lib/event");
 var useragent = require("./lib/useragent");
 var config = require("./config");
-var net = require("./lib/net");
 var GutterLayer = require("./layer/gutter").Gutter;
 var MarkerLayer = require("./layer/marker").Marker;
 var TextLayer = require("./layer/text").Text;