Moves polyfill to avoid situation where superClass_ field gets overrw…

…itten by parent. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=154925094
google · May 3, 2017 · f5d74cf · f5d74cf
1 parent c661709
commit f5d74cf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 32 deletions.
diff --git a/src/com/google/javascript/jscomp/js/es6/util/inherits.js b/src/com/google/javascript/jscomp/js/es6/util/inherits.js
@@ -54,6 +54,7 @@ $jscomp.inherits = function(childCtor, parentCtor) {
   /** @constructor */
   function tempCtor() {}
   tempCtor.prototype = parentCtor.prototype;
+  childCtor.superClass_ = parentCtor.prototype;
   childCtor.prototype = new tempCtor();
   /** @override */
     childCtor.prototype.constructor = childCtor;
@@ -69,5 +70,4 @@ $jscomp.inherits = function(childCtor, parentCtor) {
       childCtor[p] = parentCtor[p];
     }
   }
-  childCtor.superClass_ = parentCtor.prototype;
 };
diff --git a/src/com/google/javascript/jscomp/resources.json b/src/com/google/javascript/jscomp/resources.json
diff --git a/test/com/google/javascript/jscomp/runtime_tests/superclass_test.js b/test/com/google/javascript/jscomp/runtime_tests/superclass_test.js