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

6
test/fixtures/transformation/source-maps/class/expected.js vendored
View File

@@ -1,7 +1,11 @@
"use strict";
var _classProps = function (child, staticProps, instanceProps) {
if (staticProps) Object.defineProperties(child, staticProps);
if (instanceProps) Object.defineProperties(child.prototype, instanceProps);
};
var Test = (function () {
var Test = function Test() {};
Object.defineProperties(Test.prototype, { bar: { get: function () {
_classProps(Test, null, { bar: { get: function () {
throw new Error("wow");
} } });
return Test;

2
test/fixtures/transformation/source-maps/class/source-mappings.json vendored
View File

@@ -4,7 +4,7 @@
"column": 11
},
"generated": {
"line": 5,
"line": 9,
"column": 11
}
}]