sheetjs
/
sheetjs
24
Fork 24
Code Issues 170 Pull Requests 12 Wiki Activity

xml preserve space regex

This commit is contained in:
SheetJS 2013-03-21 10:15:52 -04:00
parent d5da2eb017
commit ce9e211760
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xlsx.js
View File

@ -104,7 +104,7 @@ function parseSheet(data) { //TODO: use a real xml parser
//s.cells = {};
var q = ["v","f"];
if(!data.match(/<sheetData *\/>/))
data.match(/<sheetData>(.*)<\/sheetData>/)[1].split("</row>").forEach(function(x) {
data.match(/<sheetData>([^]*)<\/sheetData>/)[1].split("</row>").forEach(function(x) {
if(x === "") return;
var row = parsexmltag(x.match(/<row[^>]*>/)[0]); //s.rows[row.r]=row.spans;
if(refguess.s.r > row.r - 1) refguess.s.r = row.r - 1;
@ -147,7 +147,7 @@ function parseSheet(data) { //TODO: use a real xml parser
}
// matches <foo>...</foo> extracts content
function matchtag(f,g) {return new RegExp('<' + f + '>([\\s\\S]*)</' + f + '>',g||"");}
function matchtag(f,g) {return new RegExp('<'+f+'(?: xml:space="preserve")?>([^]*)</'+f+'>',(g||"")+"m");}
function parseVector(data) {
var h = parsexmltag(data);