Browse Source

Using latest (3.1.4)

pull/180/head
Matthew Holt 11 years ago
parent
commit
d25b8d01f4
  1. 15
      resources/js/papaparse.js

15
resources/js/papaparse.js

@ -1,6 +1,6 @@
/* /*
Papa Parse Papa Parse
v3.1.3 v3.1.4
https://github.com/mholt/PapaParse https://github.com/mholt/PapaParse
*/ */
(function(global) (function(global)
@ -190,7 +190,7 @@
return results; return results;
} }
} }
else if (_input instanceof File) else if ((global.File && _input instanceof File) || _input instanceof Object) // ...Safari. (see issue #106)
{ {
if (config.step || config.chunk) if (config.step || config.chunk)
{ {
@ -565,7 +565,7 @@
// FileReader is better than FileReaderSync (even in worker) - see http://stackoverflow.com/q/24708649/1048862 // FileReader is better than FileReaderSync (even in worker) - see http://stackoverflow.com/q/24708649/1048862
// But Firefox is a pill, too - see issue #76: https://github.com/mholt/PapaParse/issues/76 // But Firefox is a pill, too - see issue #76: https://github.com/mholt/PapaParse/issues/76
var usingAsyncReader = typeof FileReader === 'function'; var usingAsyncReader = typeof FileReader !== 'undefined'; // Safari doesn't consider it a function (sigh...) - see issue #105
this.stream = function(f) this.stream = function(f)
{ {
@ -722,7 +722,6 @@
this.parse = function(input) this.parse = function(input)
{ {
//_stepCounter = 0;
_delimiterError = false; _delimiterError = false;
if (!_config.delimiter) if (!_config.delimiter)
{ {
@ -821,9 +820,9 @@
if (_config.dynamicTyping) if (_config.dynamicTyping)
{ {
var value = _results.data[i][j]; var value = _results.data[i][j];
if (value == "true") if (value === "true" || value === "TRUE")
_results.data[i][j] = true; _results.data[i][j] = true;
else if (value == "false") else if (value === "false" || value === "FALSE")
_results.data[i][j] = false; _results.data[i][j] = false;
else else
_results.data[i][j] = tryParseFloat(value); _results.data[i][j] = tryParseFloat(value);
@ -1224,7 +1223,7 @@
function getScriptPath() function getScriptPath()
{ {
var id = "worker" + String(Math.random()).substr(2); var id = "worker" + String(Math.random()).substr(2);
document.write('<script id="'+id+'"></script>'); document.write('<script id="'+id+'"></s'+'cript>');
return document.getElementById(id).previousSibling.src; return document.getElementById(id).previousSibling.src;
} }
@ -1293,7 +1292,7 @@
finished: true finished: true
}); });
} }
else if (msg.input instanceof File) else if ((global.File && msg.input instanceof File) || msg.input instanceof Object) // thank you, Safari (see issue #106)
{ {
var results = Papa.parse(msg.input, msg.config); var results = Papa.parse(msg.input, msg.config);
if (results) if (results)

Loading…
Cancel
Save