From 7c5bc5b20d2186adef2610d6750e37d01ece2c88 Mon Sep 17 00:00:00 2001
From: SheetJS <dev@sheetjs.com>
Date: Thu, 26 Dec 2013 00:38:44 -0500
Subject: [PATCH] default to readAsBinaryString

---
 index.html    | 24 +++++++++++++++---------
 xlsxworker.js |  4 +++-
 2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/index.html b/index.html
index 63418f4..5049930 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<!-- xlsx.js (C) 2013 SheetJS http://sheetjs.com -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -35,17 +36,18 @@
 <script src="xlsx.js"></script>
 <script src="shim.js"></script>
 <script>
+var rABS = typeof FileReader.prototype.readAsBinaryString !== "undefined";
 function xlsxworker(data, cb) {
 	var worker = new Worker('./xlsxworker.js');
 	worker.onmessage = function(e) {
 		switch(e.data.t) {
 			case 'ready': break;
-			case 'e': console.error(e.data.d);
+			case 'e': console.error(e.data.d); break;
 			case 'xlsx': cb(JSON.parse(e.data.d)); break;
 		}
 	};
-    var arr = btoa(String.fromCharCode.apply(null, new Uint8Array(data)));
-	worker.postMessage(arr);
+	var arr = rABS ? data : btoa(String.fromCharCode.apply(null, new Uint8Array(data)));
+	worker.postMessage({d:arr,b:rABS});
 }
 
 function get_radio_value( radioName ) {
@@ -130,14 +132,18 @@ function handleDrop(e) {
 			if(typeof Worker !== 'undefined') {
 				xlsxworker(data, process_wb);
 			} else {
-			//var wb = XLSX.read(data, {type: 'binary'});
-			var arr = String.fromCharCode.apply(null, new Uint8Array(data));
-			var wb = XLSX.read(btoa(arr), {type: 'base64'});
-			process_wb(wb);
+				var wb;
+				if(rABS) {
+					wb = XLSX.read(data, {type: 'binary'});
+				} else {
+					var arr = String.fromCharCode.apply(null, new Uint8Array(data));
+					wb = XLSX.read(btoa(arr), {type: 'base64'});
+				}
+				process_wb(wb);
 			}
 		};
-		//reader.readAsBinaryString(f);
-		reader.readAsArrayBuffer(f);
+		if(rABS) reader.readAsBinaryString(f);
+		else reader.readAsArrayBuffer(f);
 	}
 }
 
diff --git a/xlsxworker.js b/xlsxworker.js
index c58d05c..074f307 100644
--- a/xlsxworker.js
+++ b/xlsxworker.js
@@ -1,3 +1,4 @@
+/* xlsx.js (C) 2013 SheetJS -- http://sheetjs.com */
 importScripts('jszip.js');
 importScripts('xlsx.js');
 postMessage({t:"ready"});
@@ -5,7 +6,8 @@ postMessage({t:"ready"});
 onmessage = function (oEvent) {
   var v;
   try {
-    v = XLSX.read(oEvent.data, {type: 'base64'});
+    //postMessage({t:'e', d:oEvent.data.b});
+    v = XLSX.read(oEvent.data.d, {type: oEvent.data.b ? 'binary': 'base64'});
   } catch(e) { postMessage({t:"e",d:e.stack}); }
   postMessage({t:"xlsx", d:JSON.stringify(v)});
 };
