Permalink
Browse files

fixed shim [ci skip]

  • Loading branch information...
1 parent 25fedce commit 365925c638bbb68644f5c23a1f48cd0dbe0f7375 @SheetJSDev SheetJSDev committed Jun 29, 2014
Showing with 43 additions and 32 deletions.
  1. +7 −2 README.md
  2. +36 −30 shim.js
View
@@ -36,11 +36,11 @@ The complete single-file version is generated at `dist/xls.full.min.js`
## ECMAScript 5 compatibility
-Since xlsx.js uses ES5 functions like `Array#forEach`, older browsers require
+Since xls.js uses ES5 functions like `Array#forEach`, older browsers require
[Polyfills](http://git.io/QVh77g). This repo and the gh-pages branch include
[a shim](https://github.com/SheetJS/js-xls/blob/master/shim.js)
-To use the shim, add the shim before the script tag that loads xlsx.js:
+To use the shim, add the shim before the script tag that loads xls.js:
<script type="text/javascript" src="/path/to/shim.js"></script>
@@ -196,6 +196,11 @@ The exported `read` and `readFile` functions accept an options argument:
## Tested Environments
+ - NodeJS 0.8, 0.10 (latest release), 0.11 (unstable)
+ - 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
+
Tests utilize the mocha testing framework. Travis-CI and Sauce Labs links:
- <https://travis-ci.org/SheetJS/js-xls> for XLS module in node
View
@@ -13,16 +13,16 @@ if (!Object.keys) {
'constructor'
],
dontEnumsLength = dontEnums.length;
-
+
return function (obj) {
if (typeof obj !== 'object' && typeof obj !== 'function' || obj === null) throw new TypeError('Object.keys called on non-object');
-
+
var result = [];
-
+
for (var prop in obj) {
if (hasOwnProperty.call(obj, prop)) result.push(prop);
}
-
+
if (hasDontEnumBug) {
for (var i=0; i < dontEnumsLength; i++) {
if (hasOwnProperty.call(obj, dontEnums[i])) result.push(dontEnums[i]);
@@ -39,15 +39,15 @@ if (!Array.prototype.filter)
Array.prototype.filter = function(fun /*, thisp */)
{
"use strict";
-
+
if (this == null)
throw new TypeError();
-
+
var t = Object(this);
var len = t.length >>> 0;
if (typeof fun != "function")
throw new TypeError();
-
+
var res = [];
var thisp = arguments[1];
for (var i = 0; i < len; i++)
@@ -59,7 +59,7 @@ if (!Array.prototype.filter)
res.push(val);
}
}
-
+
return res;
};
}
@@ -99,74 +99,74 @@ if (!Array.prototype.forEach)
// Reference: http://es5.github.com/#x15.4.4.19
if (!Array.prototype.map) {
Array.prototype.map = function(callback, thisArg) {
-
+
var T, A, k;
-
+
if (this == null) {
throw new TypeError(" this is null or not defined");
}
-
+
// 1. Let O be the result of calling ToObject passing the |this| value as the argument.
var O = Object(this);
-
+
// 2. Let lenValue be the result of calling the Get internal method of O with the argument "length".
// 3. Let len be ToUint32(lenValue).
var len = O.length >>> 0;
-
+
// 4. If IsCallable(callback) is false, throw a TypeError exception.
// See: http://es5.github.com/#x9.11
if (typeof callback !== "function") {
throw new TypeError(callback + " is not a function");
}
-
+
// 5. If thisArg was supplied, let T be thisArg; else let T be undefined.
if (thisArg) {
T = thisArg;
}
-
+
// 6. Let A be a new array created as if by the expression new Array(len) where Array is
// the standard built-in constructor with that name and len is the value of len.
A = new Array(len);
-
+
// 7. Let k be 0
k = 0;
-
+
// 8. Repeat, while k < len
while(k < len) {
-
+
var kValue, mappedValue;
-
+
// a. Let Pk be ToString(k).
// This is implicit for LHS operands of the in operator
// b. Let kPresent be the result of calling the HasProperty internal method of O with argument Pk.
// This step can be combined with c
// c. If kPresent is true, then
if (k in O) {
-
+
// i. Let kValue be the result of calling the Get internal method of O with argument Pk.
kValue = O[ k ];
-
+
// ii. Let mappedValue be the result of calling the Call internal method of callback
// with T as the this value and argument list containing kValue, k, and O.
mappedValue = callback.call(T, kValue, k, O);
-
+
// iii. Call the DefineOwnProperty internal method of A with arguments
// Pk, Property Descriptor {Value: mappedValue, : true, Enumerable: true, Configurable: true},
// and false.
-
+
// In browsers that support Object.defineProperty, use the following:
// Object.defineProperty(A, Pk, { value: mappedValue, writable: true, enumerable: true, configurable: true });
-
+
// For best browser support, use the following:
A[ k ] = mappedValue;
}
// d. Increase k by 1.
k++;
}
-
+
// 9. return A
return A;
- };
+ };
}
// From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf
@@ -202,6 +202,12 @@ if (!Array.prototype.indexOf) {
}
// Based on https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/isArray
+if (! Array.isArray) {
+ Array.isArray = function(obj) {
+ return Object.prototype.toString.call(obj) === "[object Array]";
+ };
+}
+
// https://github.com/ttaubert/node-arraybuffer-slice
// (c) 2013 Tim Taubert <tim@timtaubert.de>
// arraybuffer-slice may be freely distributed under the MIT license.
@@ -224,8 +230,8 @@ if (typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) {
var length = Math.min(num - begin, end - begin);
var target = new ArrayBuffer(length);
-if (! Array.isArray) {
- Array.isArray = function(obj) {
- return Object.prototype.toString.call(obj) === "[object Array]";
- };
+ var targetArray = new Uint8Array(target);
+ targetArray.set(new Uint8Array(this, begin, length));
+ return target;
+ };
}

0 comments on commit 365925c

Please sign in to comment.