summaryrefslogtreecommitdiffstats
path: root/js/vendor/es6-shim/es6-sham.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/vendor/es6-shim/es6-sham.js')
-rw-r--r--js/vendor/es6-shim/es6-sham.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/js/vendor/es6-shim/es6-sham.js b/js/vendor/es6-shim/es6-sham.js
index 851b83046..65f0f5cc6 100644
--- a/js/vendor/es6-shim/es6-sham.js
+++ b/js/vendor/es6-shim/es6-sham.js
@@ -2,8 +2,8 @@
* https://github.com/paulmillr/es6-shim
* @license es6-shim Copyright 2013-2015 by Paul Miller (http://paulmillr.com)
* and contributors, MIT License
- * es6-sham: v0.33.8
- * see https://github.com/paulmillr/es6-shim/blob/0.33.8/LICENSE
+ * es6-sham: v0.33.12
+ * see https://github.com/paulmillr/es6-shim/blob/0.33.12/LICENSE
* Details and documentation:
* https://github.com/paulmillr/es6-shim/
*/
@@ -28,7 +28,9 @@
'use strict';
/*jshint evil: true */
+ /* eslint-disable no-new-func */
var getGlobal = new Function('return this;');
+ /* eslint-enable no-new-func */
/*jshint evil: false */
var globals = getGlobal();
@@ -85,20 +87,24 @@
};
} catch (e) {
// do one or more feature detections
- set = {__proto__: null};
+ set = { __proto__: null };
// if proto does not work, needs to fallback
// some Opera, Rhino, ducktape
if (set instanceof Object) {
setPrototypeOf = createAndCopy;
} else {
// verify if null objects are buggy
+ /* eslint-disable no-proto */
set.__proto__ = objProto;
+ /* eslint-enable no-proto */
// if null objects are buggy
// nodejs 0.8 to 0.10
if (set instanceof Object) {
setPrototypeOf = function (origin, proto) {
// use such bug to promote
+ /* eslint-disable no-proto */
origin.__proto__ = proto;
+ /* eslint-enable no-proto */
return origin;
};
} else {
@@ -108,7 +114,9 @@
// if proto is not null
if (getPrototypeOf(origin)) {
// use __proto__ to promote
+ /* eslint-disable no-proto */
origin.__proto__ = proto;
+ /* eslint-enable no-proto */
return origin;
} else {
// otherwise unable to promote: fallback