aboutsummaryrefslogtreecommitdiff
path: root/src/library_browser.js
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-05-14 21:09:37 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-05-14 21:09:37 -0700
commitf66293c6affe4e4c4ddb5ec40dff802dee989094 (patch)
tree1b30939eae7599027c35e215e22dc6d05cc4916c /src/library_browser.js
parent9d376d8bde5816e357c702fea6dc463992dab02a (diff)
library stuff
Diffstat (limited to 'src/library_browser.js')
-rw-r--r--src/library_browser.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index ccc13698..08d206ae 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -5,9 +5,13 @@ mergeInto(Library, {
syncLoad: function(url) {
var xhr = new XMLHttpRequest();
xhr.open("GET", url, false);
+ xhr.overrideMimeType('text/plain; charset=x-user-defined');
xhr.send(null);
- var buffer = xhr.mozResponseArrayBuffer;
- return new Uint8Array(buffer);
+ var ret = new Uint8Array(xhr.responseText.length);
+ for (var i = 0; i < xhr.responseText.length; i++) {
+ ret[i] = xhr.responseText.charCodeAt(i);
+ }
+ return ret;
},
// Given binary data for an image, in a format like PNG or JPG, we convert it
@@ -41,7 +45,7 @@ mergeInto(Library, {
var canvas = document.createElement('canvas');
img.src = 'data:image/' + format + ';base64,' + encodeBase64(pixels);
var ctx = canvas.getContext('2d');
- ctx.drawImage(Module.img, 0, 0);
+ ctx.drawImage(img, 0, 0);
var imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
return imageData;
},