Fix class inheritance in IE <=10 (T3041) (#3527)
* Fix class inheritance in IE9 & IE10 (T3041) Internet Explorer 9&10 do not support __proto__ at all, don't have Object.setPrototypeOf(), but have Object.getPrototypeOf(). Because of this setting the prototype is not possible, which makes the babelHelpers.inherits() function to set __proto__ although not supported. Afterwards Object.getPrototypeOf() is used, but this one is not respecting the "custom" property __proto__ that we set. The solution is to check for __proto__ first and afterwards fallback to Object.getPrototypeOf(). * Do the same logic in babel-helper-replace-supers * Fix tests * Extract creation of prototype nodes to small helper
This commit is contained in:
committed by
Henry Zhu
parent
2a4186faf3
commit
10cd6519d8
@@ -5,7 +5,7 @@ var Foo = function (_Bar) {
|
||||
var _temp, _this, _ret;
|
||||
|
||||
babelHelpers.classCallCheck(this, Foo);
|
||||
return _ret = (_temp = (_this = babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(Foo).call(this, ...args)), _this), _this.bar = "foo", _temp), babelHelpers.possibleConstructorReturn(_this, _ret);
|
||||
return _ret = (_temp = (_this = babelHelpers.possibleConstructorReturn(this, (Foo.__proto__ || Object.getPrototypeOf(Foo)).call(this, ...args)), _this), _this.bar = "foo", _temp), babelHelpers.possibleConstructorReturn(_this, _ret);
|
||||
}
|
||||
|
||||
return Foo;
|
||||
|
||||
@@ -6,7 +6,7 @@ var Child = function (_Parent) {
|
||||
function Child() {
|
||||
babelHelpers.classCallCheck(this, Child);
|
||||
|
||||
var _this = babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(Child).call(this));
|
||||
var _this = babelHelpers.possibleConstructorReturn(this, (Child.__proto__ || Object.getPrototypeOf(Child)).call(this));
|
||||
|
||||
_this.scopedFunctionWithThis = function () {
|
||||
_this.name = {};
|
||||
|
||||
@@ -6,7 +6,7 @@ var Foo = function (_Bar) {
|
||||
|
||||
babelHelpers.classCallCheck(this, Foo);
|
||||
|
||||
foo((_temp = (_this = babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(Foo).call(this)), _this), _this.bar = "foo", _temp));
|
||||
foo((_temp = (_this = babelHelpers.possibleConstructorReturn(this, (Foo.__proto__ || Object.getPrototypeOf(Foo)).call(this)), _this), _this.bar = "foo", _temp));
|
||||
return _this;
|
||||
}
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ var Foo = function (_Bar) {
|
||||
function Foo() {
|
||||
babelHelpers.classCallCheck(this, Foo);
|
||||
|
||||
var _this = babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(Foo).call(this));
|
||||
var _this = babelHelpers.possibleConstructorReturn(this, (Foo.__proto__ || Object.getPrototypeOf(Foo)).call(this));
|
||||
|
||||
_this.bar = "foo";
|
||||
return _this;
|
||||
|
||||
@@ -6,7 +6,7 @@ function withContext(ComposedComponent) {
|
||||
|
||||
function WithContext() {
|
||||
babelHelpers.classCallCheck(this, WithContext);
|
||||
return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(WithContext).apply(this, arguments));
|
||||
return babelHelpers.possibleConstructorReturn(this, (WithContext.__proto__ || Object.getPrototypeOf(WithContext)).apply(this, arguments));
|
||||
}
|
||||
|
||||
return WithContext;
|
||||
|
||||
Reference in New Issue
Block a user