diff --git a/bits/70_xlsx.js b/bits/70_xlsx.js index 2172c4c..618ba3d 100644 --- a/bits/70_xlsx.js +++ b/bits/70_xlsx.js @@ -143,7 +143,7 @@ function parseSheet(data) { /* 18.3.1.80 sheetData CT_SheetData ? */ if(!data.match(//)) - data.match(/([^]*)<\/sheetData>/m)[1].split("").forEach(function(x) { + data.match(/([^\u2603]*)<\/sheetData>/m)[1].split("").forEach(function(x) { if(x === "" || x.trim() === "") return; /* 18.3.1.73 row CT_Row */ @@ -204,7 +204,7 @@ function parseSheet(data) { } // matches ... extracts content -function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^]*)',(g||"")+"m");} +function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^\u2603]*)',(g||"")+"m");} function parseVector(data) { var h = parsexmltag(data); diff --git a/package.json b/package.json index 19421dc..6db2553 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xlsx", - "version": "0.2.4", + "version": "0.2.5", "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 2a42f89..383e482 100644 --- a/xlsx.js +++ b/xlsx.js @@ -367,7 +367,7 @@ function parseSheet(data) { /* 18.3.1.80 sheetData CT_SheetData ? */ if(!data.match(//)) - data.match(/([^]*)<\/sheetData>/m)[1].split("").forEach(function(x) { + data.match(/([^\u2603]*)<\/sheetData>/m)[1].split("").forEach(function(x) { if(x === "" || x.trim() === "") return; /* 18.3.1.73 row CT_Row */ @@ -428,7 +428,7 @@ function parseSheet(data) { } // matches ... extracts content -function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^]*)',(g||"")+"m");} +function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^\u2603]*)',(g||"")+"m");} function parseVector(data) { var h = parsexmltag(data);