Merge branch 'master' of github.com:6to5/6to5

This commit is contained in:
Sebastian McKenzie 2015-01-18 12:16:23 +11:00
commit 0bb52d6e3d
2 changed files with 1 additions and 2 deletions

View File

@ -1,6 +1,5 @@
var ReplaceSupers = require("../helpers/replace-supers"); var ReplaceSupers = require("../helpers/replace-supers");
var nameMethod = require("../helpers/name-method"); var nameMethod = require("../helpers/name-method");
var traverse = require("../../traverse");
var util = require("../../util"); var util = require("../../util");
var t = require("../../types"); var t = require("../../types");

View File

@ -226,7 +226,7 @@ var addDisplayName = function (id, call) {
var safe = true; var safe = true;
for (var i = 0; i < props.length; i++) { for (var i = 0; i < props.length; i++) {
prop = props[i]; var prop = props[i];
if (t.isIdentifier(prop.key, { name: "displayName" })) { if (t.isIdentifier(prop.key, { name: "displayName" })) {
safe = false; safe = false;
break; break;