2 files changed, 41 insertions, 9 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index 9283913f..6015168f 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -86,6 +86,7 @@ mergeInto(LibraryManager.library, {
     requestFullScreen: function() {
       var canvas = Module.canvas;
       function fullScreenChange() {
+        if (Module['onFullScreen']) Module['onFullScreen']();
         if (document['webkitFullScreenElement'] === canvas ||
             document['mozFullScreenElement'] === canvas ||
             document['fullScreenElement'] === canvas) {
@@ -142,24 +143,55 @@ mergeInto(LibraryManager.library, {
              0;
     },
 
-    asyncLoad: function(url, callback) {
+    xhrLoad: function(url, onload, onerror) {
       var xhr = new XMLHttpRequest();
       xhr.open('GET', url, true);
       xhr.responseType = 'arraybuffer';
       xhr.onload = function() {
-        var arrayBuffer = xhr.response;
+        if (xhr.status == 200) {
+          onload(xhr.response);
+        } else {
+          onerror();
+        }
+      };
+      xhr.onerror = onerror;
+      xhr.send(null);
+    },
+
+    asyncLoad: function(url, callback) {
+      Browser.xhrLoad(url, function(arrayBuffer) {
         assert(arrayBuffer, 'Loading data file "' + url + '" failed (no arrayBuffer).');
         callback(new Uint8Array(arrayBuffer));
         removeRunDependency();
-      };
-      xhr.onerror = function(event) {
-        assert(arrayBuffer, 'Loading data file "' + url + '" failed.');
-      };
-      xhr.send(null);
+      }, function(event) {
+        throw 'Loading data file "' + url + '" failed.';
+      });
       addRunDependency();
     }
   },
 
+  emscripten_async_wget: function(url, file, onload, onerror) {
+    url = Pointer_stringify(url);
+
+    Browser.xhrLoad(url, function(response) {
+      var absolute = Pointer_stringify(file);
+      var index = absolute.lastIndexOf('/');
+      FS.createDataFile(
+        absolute.substr(0, index),
+        absolute.substr(index +1), 
+        new Uint8Array(response), 
+        true, true);
+
+      if (onload) {
+        FUNCTION_TABLE[onload](file);
+      }
+    }, function(event) {
+      if (onerror) {
+        FUNCTION_TABLE[onerror](file);
+      }
+    });
+  },
+
   emscripten_async_run_script__deps: ['emscripten_run_script'],
   emscripten_async_run_script: function(script, millis) {
     Module['noExitRuntime'] = true;
diff --git a/src/library_gl.js b/src/library_gl.js
index 37dcf0a5..89603572 100644
--- a/src/library_gl.js
+++ b/src/library_gl.js
@@ -294,7 +294,7 @@ var LibraryGL = {
     } else {
       data = null;
     }
-    Module.ctx.compressedTexImage2D(target, level, internalformat, width, height, border, data);
+    Module.ctx['compressedTexImage2D'](target, level, internalformat, width, height, border, data);
   },
 
   glCompressedTexSubImage2D: function(target, level, xoffset, yoffset, width, height, format, imageSize, data) {
@@ -303,7 +303,7 @@ var LibraryGL = {
     } else {
       data = null;
     }
-    Module.ctx.compressedTexSubImage2D(target, level, xoffset, yoffset, width, height, data);
+    Module.ctx['compressedTexSubImage2D'](target, level, xoffset, yoffset, width, height, data);
   },
 
   glTexImage2D: function(target, level, internalformat, width, height, border, format, type, pixels) {