cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into code-generator

Browse Source 
Conflicts:
	lib/6to5/transformers/classes.js
	test/fixtures/transformation/source-maps/class/expected.js
	test/fixtures/transformation/source-maps/class/source-mappings.json
This commit is contained in:
Sebastian McKenzie
2014-11-03 13:38:44 +11:00
parent 6d6039aeb6 c17878913b
commit 95f3ca6348
14 changed files with 110 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/6to5/util.js
View File

@@ -100,7 +100,7 @@ exports.pushMutatorMap = function (mutatorMap, key, kind, method) {
}
};
exports.buildDefineProperties = function (mutatorMap, keyNode) {
exports.buildDefineProperties = function (mutatorMap) {
var objExpr = b.objectExpression([]);
_.each(mutatorMap, function (map, key) {
@@ -117,10 +117,7 @@ exports.buildDefineProperties = function (mutatorMap, keyNode) {
objExpr.properties.push(propNode);
});
return exports.template("object-define-properties", {
OBJECT: keyNode,
PROPS: objExpr
}, true);
return objExpr;
};
exports.template = function (name, nodes, keepExpression) {