Permalink
Browse files

version bump 0.7.4: cleanup related to node bug

See nodejs/node-v0.x-archive#9181, introduced in 0.11.15

Since bug affects nodejs stable 0.12, travis now uses 0.11.14 and io.js
  • Loading branch information...
1 parent 96a37d3 commit dcea6a34bebad811895d46a78d51fe64554fc390 @SheetJSDev SheetJSDev committed Feb 10, 2015
Showing with 27 additions and 26 deletions.
  1. +2 −1 .travis.yml
  2. +1 −1 LICENSE
  3. +9 −9 README.md
  4. +1 −1 bits/00_header.js
  5. +1 −1 bits/01_version.js
  6. +1 −1 bower.json
  7. +1 −1 dist/LICENSE
  8. +2 −2 dist/xls.core.min.js
  9. +2 −2 dist/xls.full.min.js
  10. +2 −2 dist/xls.js
  11. +2 −2 dist/xls.min.js
  12. +1 −1 package.json
  13. +2 −2 xls.js
View
@@ -1,6 +1,7 @@
language: node_js
node_js:
- - "0.11"
+ - "iojs"
+ - "0.11.14"
- "0.10"
- "0.8"
before_install:
View
@@ -1,4 +1,4 @@
-Copyright (C) 2012-2014 SheetJS
+Copyright (C) 2012-2015 SheetJS
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
@@ -9,15 +9,15 @@ Source: <http://git.io/xls>
## Installation
-In [nodejs](https://www.npmjs.org/package/xlsjs):
+With [npm](https://www.npmjs.org/package/xlsjs):
npm install xlsjs
In the browser:
<script lang="javascript" src="xls.js"></script>
-In [bower](http://bower.io/search/?q=js-xls):
+With [bower](http://bower.io/search/?q=js-xls):
bower install js-xls
@@ -26,7 +26,7 @@ CDNjs automatically pulls the latest version and makes all versions available at
## Optional Modules
-The nodejs version automatically requires modules for additional features. Some
+The node version automatically requires modules for additional features. Some
of these modules are rather large in size and are only needed in special
circumstances, so they do not ship with the core. For browser use, they must
be included directly:
@@ -53,7 +53,7 @@ To use the shim, add the shim before the script tag that loads xls.js:
For parsing, the first step is to read the file. This involves acquiring the
data and feeding it into the library. Here are a few common scenarios:
-- nodejs readFile:
+- node readFile:
```
if(typeof require !== 'undefined') XLS = require('xlsjs');
@@ -135,9 +135,9 @@ mode is provided for testing. On OSX you can get the base64 encoding with:
- <http://oss.sheetjs.com/js-xls/ajax.html> XMLHttpRequest
-- <https://github.com/SheetJS/js-xls/blob/master/bin/xls.njs> nodejs
+- <https://github.com/SheetJS/js-xls/blob/master/bin/xls.njs> node
-The nodejs version installs a binary `xls` which can read XLS and XML2003
+The node version installs a binary `xls` which can read XLS and XML2003
files and output the contents in various formats. The source is available at
`xls.njs` in the bin directory.
@@ -149,7 +149,7 @@ Some helper functions in `XLS.utils` generate different views of the sheets:
## Interface
-`XLS` is the exposed variable in the browser and the exported nodejs variable
+`XLS` is the exposed variable in the browser and the exported node variable
`XLS.version` is the version of the library (added by the build script).
@@ -309,7 +309,7 @@ The exported `read` and `readFile` functions accept an options argument:
## Tested Environments
- - NodeJS 0.8, 0.10 (latest release), 0.11 (unstable)
+ - NodeJS 0.8, 0.10 (latest release), 0.11.14 (unstable), io.js
- IE 6/7/8/9/10/11 using Base64 mode (IE10/11 using HTML5 mode)
- FF 18 using Base64 or HTML5 mode
- Chrome 24 using Base64 or HTML5 mode
@@ -328,7 +328,7 @@ Running `make init` will refresh the `test_files` submodule and get the files.
## Testing
-`make test` will run the nodejs-based tests. To run the in-browser tests, clone
+`make test` will run the node-based tests. To run the in-browser tests, clone
[the oss.sheetjs.com repo](https://github.com/SheetJS/SheetJS.github.io) and
replace the xls.js file (then fire up the browser and go to `stress.html`):
View
@@ -1,4 +1,4 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
/* vim: set ts=2: */
/*jshint funcscope:true, eqnull:true */
var XLS = {};
View
@@ -1 +1 @@
-XLS.version = '0.7.3';
+XLS.version = '0.7.4';
View
@@ -2,7 +2,7 @@
"name": "js-xls",
"homepage": "https://github.com/SheetJS/js-xls",
"main": "dist/xls.js",
- "version": "0.7.3",
+ "version": "0.7.4",
"ignore": [
"bin",
"bits",
View
@@ -1,4 +1,4 @@
-Copyright (C) 2012-2014 SheetJS
+Copyright (C) 2012-2015 SheetJS
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Oops, something went wrong.
Oops, something went wrong.
View
@@ -1,9 +1,9 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
/* vim: set ts=2: */
/*jshint funcscope:true, eqnull:true */
var XLS = {};
(function make_xls(XLS){
-XLS.version = '0.7.3';
+XLS.version = '0.7.4';
var current_codepage = 1200, current_cptable;
if(typeof module !== "undefined" && typeof require !== 'undefined') {
if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel');
View
Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "xlsjs",
- "version": "0.7.3",
+ "version": "0.7.4",
"author": "sheetjs",
"description": "Excel 5.0/95 and 97-2004 spreadsheet (BIFF5 XLS / BIFF8 XLS / XML 2003) parser",
"keywords": [ "excel", "xls", "office", "spreadsheet" ],
View
@@ -1,9 +1,9 @@
-/* xls.js (C) 2013-2014 SheetJS -- http://sheetjs.com */
+/* xls.js (C) 2013-2015 SheetJS -- http://sheetjs.com */
/* vim: set ts=2: */
/*jshint funcscope:true, eqnull:true */
var XLS = {};
(function make_xls(XLS){
-XLS.version = '0.7.3';
+XLS.version = '0.7.4';
var current_codepage = 1200, current_cptable;
if(typeof module !== "undefined" && typeof require !== 'undefined') {
if(typeof cptable === 'undefined') cptable = require('./dist/cpexcel');

0 comments on commit dcea6a3

Please sign in to comment.