From 99d879ee309cb9c4943710aae4f93081afce9316 Mon Sep 17 00:00:00 2001
From: SheetJS <dev@sheetjs.com>
Date: Thu, 6 Feb 2014 17:02:11 -0500
Subject: [PATCH] version bump 0.5.2: chores

- node jszip updated to 2.1.0 as per https://github.com/Stuk/jszip/issues/84
- travis 0.8 tests restored
- get_formulae ignores undefined values
- updated test_files to 20140206
---
 .travis.yml        | 2 +-
 bits/31_version.js | 2 +-
 bits/90_utils.js   | 1 +
 package.json       | 4 ++--
 tests/files        | 2 +-
 xlsx.js            | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58abef2..7cac3bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
-#  - "0.8"
+  - "0.8"
 before_install:
   - "npm install -g mocha"
   - "npm install blanket"
diff --git a/bits/31_version.js b/bits/31_version.js
index bcd5a39..ede97ea 100644
--- a/bits/31_version.js
+++ b/bits/31_version.js
@@ -1 +1 @@
-XLSX.version = '0.5.1';
+XLSX.version = '0.5.2';
diff --git a/bits/90_utils.js b/bits/90_utils.js
index fd31f2c..2ae2f34 100644
--- a/bits/90_utils.js
+++ b/bits/90_utils.js
@@ -89,6 +89,7 @@ function get_formulae(ws) {
 		var x = ws[y];
 		var val = "";
 		if(x.f) val = x.f;
+		else if(typeof x.v === 'undefined') continue;
 		else if(typeof x.v === 'number') val = x.v;
 		else val = x.v;
 		cmds.push(y + "=" + val);
diff --git a/package.json b/package.json
index 9c3e47f..abd1b3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xlsx",
-	"version": "0.5.1",
+	"version": "0.5.2",
 	"author": "sheetjs",
 	"description": "XLSB / XLSX / XLSM parser",
 	"keywords": [ "xlsx", "xlsb", "xlsm", "office", "excel", "spreadsheet" ],
@@ -11,7 +11,7 @@
 	"dependencies": {
 		"ssf":">=0.5.5",
 		"codepage":"",
-		"jszip":"~0.2.1",
+		"jszip":"~2.1.0",
 		"commander":""
 	},
 	"devDependencies": {
diff --git a/tests/files b/tests/files
index dc34131..a2d49d3 160000
--- a/tests/files
+++ b/tests/files
@@ -1 +1 @@
-Subproject commit dc341311b12ebd490dd876086e822eb992f45e49
+Subproject commit a2d49d344622e1bd657f03e829c24d9b24a942af
diff --git a/xlsx.js b/xlsx.js
index c019471..202844f 100644
--- a/xlsx.js
+++ b/xlsx.js
@@ -420,7 +420,7 @@ SSF.load_table = function(tbl) { for(var i=0; i!=0x0188; ++i) if(tbl[i]) SSF.loa
 make_ssf(SSF);
 var XLSX = {};
 (function(XLSX){
-XLSX.version = '0.5.1';
+XLSX.version = '0.5.2';
 var current_codepage, current_cptable, cptable;
 if(typeof module !== "undefined" && typeof require !== 'undefined') {
 	if(typeof cptable === 'undefined') cptable = require('codepage');
@@ -2814,6 +2814,7 @@ function get_formulae(ws) {
 		var x = ws[y];
 		var val = "";
 		if(x.f) val = x.f;
+		else if(typeof x.v === 'undefined') continue;
 		else if(typeof x.v === 'number') val = x.v;
 		else val = x.v;
 		cmds.push(y + "=" + val);