From 5341a85f5539380304487e64913fad3b2fdb88e0 Mon Sep 17 00:00:00 2001
From: SheetJS <dev@sheetjs.com>
Date: Sat, 13 Apr 2013 09:56:25 -0400
Subject: [PATCH] version bump 0.2.6: IE10 Drag and Drop support
---
bits/90_utils.js | 1 -
index.html | 11 ++++++++---
package.json | 2 +-
xlsx.js | 1 -
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/bits/90_utils.js b/bits/90_utils.js
index ac07e96..d0a83d7 100644
--- a/bits/90_utils.js
+++ b/bits/90_utils.js
@@ -79,7 +79,6 @@ function sheet_to_csv(sheet) {
var row = [];
for(var C = r.s.c; C <= r.e.c; ++C) {
var val = sheet[utils.encode_cell({c:C,r:R})];
- console.error(val);
row.push(val ? stringify(val).replace(/\\r\\n/g,"\n").replace(/\\t/g,"\t").replace(/\\\\/g,"\\") : "");
}
out += row.join(",") + "\n";
diff --git a/index.html b/index.html
index 6b146fc..ff3a1a0 100644
--- a/index.html
+++ b/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
<style>
#drop{
border:2px dashed #bbb;
@@ -88,10 +89,13 @@ function handleDrop(e) {
var name = f.name;
reader.onload = function(e) {
var data = e.target.result;
- var xlsx = XLSX.read(data, {type: 'binary'});
+ //var xlsx = XLSX.read(data, {type: 'binary'});
+ var arr = String.fromCharCode.apply(null, new Uint8Array(data));
+ var xlsx = XLSX.read(btoa(arr), {type: 'base64'});
process_xlsx(xlsx);
};
- reader.readAsBinaryString(f);
+ //reader.readAsBinaryString(f);
+ reader.readAsArrayBuffer(f);
}
}
@@ -101,7 +105,8 @@ function handleDragover(e) {
e.dataTransfer.dropEffect = 'copy';
}
-if(drop.addEventListener) { // IE compatibility
+if(drop.addEventListener) {
+ drop.addEventListener('dragenter', handleDragover, false);
drop.addEventListener('dragover', handleDragover, false);
drop.addEventListener('drop', handleDrop, false);
}
diff --git a/package.json b/package.json
index 6db2553..bc5acbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "xlsx",
- "version": "0.2.5",
+ "version": "0.2.6",
"author": "Niggler",
"description": "(one day) a full-featured XLSX parser and writer. For now, primitive parser",
"keywords": [
diff --git a/xlsx.js b/xlsx.js
index 383e482..d9b383c 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -906,7 +906,6 @@ function sheet_to_csv(sheet) {
var row = [];
for(var C = r.s.c; C <= r.e.c; ++C) {
var val = sheet[utils.encode_cell({c:C,r:R})];
- console.error(val);
row.push(val ? stringify(val).replace(/\\r\\n/g,"\n").replace(/\\t/g,"\t").replace(/\\\\/g,"\\") : "");
}
out += row.join(",") + "\n";