Skip to content

Commit

Permalink
version bump 0.7.4: cleanup related to node bug
Browse files Browse the repository at this point in the history
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
SheetJSDev committed Feb 10, 2015
1 parent 96a37d3 commit dcea6a3
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 26 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "0.11"
- "iojs"
- "0.11.14"
- "0.10"
- "0.8"
before_install:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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:
Expand All @@ -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');
Expand Down Expand Up @@ -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.

Expand All @@ -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).

Expand Down Expand Up @@ -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
Expand All @@ -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`):

Expand Down
2 changes: 1 addition & 1 deletion bits/00_header.js
Original file line number Diff line number Diff line change
@@ -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 = {};
Expand Down
2 changes: 1 addition & 1 deletion bits/01_version.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
XLS.version = '0.7.3';
XLS.version = '0.7.4';
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion dist/LICENSE
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions dist/xls.core.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/xls.full.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/xls.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down
4 changes: 2 additions & 2 deletions dist/xls.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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" ],
Expand Down
4 changes: 2 additions & 2 deletions xls.js
Original file line number Diff line number Diff line change
@@ -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');
Expand Down

0 comments on commit dcea6a3

Please sign in to comment.