object-keys
Advanced tools
Comparing version 1.0.7 to 1.0.8
{ | ||
"es3": true, | ||
"additionalRules": [], | ||
@@ -16,2 +18,15 @@ | ||
"disallowSpaceBeforeComma": true, | ||
"disallowSpaceBeforeSemicolon": true, | ||
"disallowNodeTypes": [ | ||
"DebuggerStatement", | ||
"LabeledStatement", | ||
"SwitchCase", | ||
"SwitchStatement", | ||
"WithStatement" | ||
], | ||
"requireObjectKeysOnNewLine": true, | ||
"requireSpacesInAnonymousFunctionExpression": { "beforeOpeningRoundBrace": true, "beforeOpeningCurlyBrace": true }, | ||
@@ -103,4 +118,16 @@ "requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true }, | ||
"requirePaddingNewLinesAfterUseStrict": true | ||
"requirePaddingNewLinesAfterUseStrict": true, | ||
"disallowArrowFunctions": true, | ||
"disallowMultiLineTernary": true, | ||
"validateOrderInObjectKeys": "asc-insensitive", | ||
"disallowIdenticalDestructuringNames": true, | ||
"disallowNestedTernaries": { "maxLevel": 1 }, | ||
"requireSpaceAfterComma": true | ||
} | ||
@@ -0,1 +1,9 @@ | ||
1.0.8 / 2015-10-14 | ||
================= | ||
* [Fix] wrap automation equality bug checking in try/catch, per [es5-shim#327](https://github.com/es-shims/es5-shim/issues/327) | ||
* [Fix] Blacklist 'window.frameElement' per [es5-shim#322](https://github.com/es-shims/es5-shim/issues/322) | ||
* [Docs] Switch from vb.teelaun.ch to versionbadg.es for the npm version badge SVG | ||
* [Tests] up to `io.js` `v3.3`, `node` `v4.2` | ||
* [Dev Deps] update `eslint`, `tape`, `@ljharb/eslint-config`, `jscs` | ||
1.0.7 / 2015-07-18 | ||
@@ -2,0 +10,0 @@ ================= |
31
index.js
@@ -8,3 +8,3 @@ 'use strict'; | ||
var isArgs = require('./isArguments'); | ||
var hasDontEnumBug = !({ 'toString': null }).propertyIsEnumerable('toString'); | ||
var hasDontEnumBug = !({ toString: null }).propertyIsEnumerable('toString'); | ||
var hasProtoEnumBug = function () {}.propertyIsEnumerable('prototype'); | ||
@@ -25,9 +25,10 @@ var dontEnums = [ | ||
var blacklistedKeys = { | ||
$window: true, | ||
$console: true, | ||
$frameElement: true, | ||
$frames: true, | ||
$parent: true, | ||
$self: true, | ||
$frames: true, | ||
$webkitIndexedDB: true, | ||
$webkitStorageInfo: true | ||
$webkitStorageInfo: true, | ||
$window: true | ||
}; | ||
@@ -38,8 +39,12 @@ var hasAutomationEqualityBug = (function () { | ||
for (var k in window) { | ||
if (!blacklistedKeys['$' + k] && has.call(window, k) && window[k] !== null && typeof window[k] === 'object') { | ||
try { | ||
equalsConstructorPrototype(window[k]); | ||
} catch (e) { | ||
return true; | ||
try { | ||
if (!blacklistedKeys['$' + k] && has.call(window, k) && window[k] !== null && typeof window[k] === 'object') { | ||
try { | ||
equalsConstructorPrototype(window[k]); | ||
} catch (e) { | ||
return true; | ||
} | ||
} | ||
} catch (e) { | ||
return true; | ||
} | ||
@@ -51,3 +56,3 @@ } | ||
/* global window */ | ||
if (typeof window === 'undefined' && !hasAutomationEqualityBug) { | ||
if (typeof window === 'undefined' || !hasAutomationEqualityBug) { | ||
return equalsConstructorPrototype(o); | ||
@@ -105,5 +110,3 @@ } | ||
keysShim.shim = function shimObjectKeys() { | ||
if (!Object.keys) { | ||
Object.keys = keysShim; | ||
} else { | ||
if (Object.keys) { | ||
var keysWorksWithArguments = (function () { | ||
@@ -123,2 +126,4 @@ // Safari 5.0 bug | ||
} | ||
} else { | ||
Object.keys = keysShim; | ||
} | ||
@@ -125,0 +130,0 @@ return Object.keys || keysShim; |
{ | ||
"name": "object-keys", | ||
"version": "1.0.7", | ||
"version": "1.0.8", | ||
"author": "Jordan Harband", | ||
@@ -31,10 +31,11 @@ "description": "An Object.keys replacement, in case Object.keys is not available. From https://github.com/es-shims/es5-shim", | ||
"foreach": "^2.0.5", | ||
"is": "^3.0.1", | ||
"tape": "^4.0.0", | ||
"is": "^3.1.0", | ||
"tape": "^4.2.1", | ||
"indexof": "^0.0.1", | ||
"covert": "^1.1.0", | ||
"jscs": "^1.13.1", | ||
"jscs": "^2.3.1", | ||
"editorconfig-tools": "^0.1.1", | ||
"nsp": "^1.0.3", | ||
"eslint": "^1.0.0-rc-1" | ||
"nsp": "^1.1.0", | ||
"eslint": "^1.6.0", | ||
"@ljharb/eslint-config": "^1.3.0" | ||
}, | ||
@@ -41,0 +42,0 @@ "testling": { |
@@ -60,3 +60,3 @@ #object-keys <sup>[![Version Badge][npm-version-svg]][package-url]</sup> | ||
[package-url]: https://npmjs.org/package/object-keys | ||
[npm-version-svg]: http://vb.teelaun.ch/ljharb/object-keys.svg | ||
[npm-version-svg]: http://versionbadg.es/ljharb/object-keys.svg | ||
[travis-svg]: https://travis-ci.org/ljharb/object-keys.svg | ||
@@ -63,0 +63,0 @@ [travis-url]: https://travis-ci.org/ljharb/object-keys |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
221
19911
10