Merge branch '4.x'

# Conflicts: # components/bower.json # components/handlebars.js.nuspec # components/package.json # package.json
2019-02-07 11:06:49 +01:00
parent 913b845aa9 1c62d4c5d0
commit f349aa43c0
8 changed files with 70 additions and 6 deletions
@@ -13,6 +13,9 @@ JavaScriptCompiler.prototype = {
  // PUBLIC API: You can override these methods in a subclass to provide
  // alternative compiled forms for name lookup and buffering semantics
  nameLookup: function(parent, name/* , type*/) {
+    if (name === 'constructor') {
+      return ['(', parent, '.propertyIsEnumerable(\'constructor\') ? ', parent, '.constructor : undefined', ')'];
+    }
    if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
      return [parent, '.', name];
    } else {