diff --git a/src/core/Base.js b/src/core/Base.js index 381b9662..83cab6a6 100644 --- a/src/core/Base.js +++ b/src/core/Base.js @@ -81,7 +81,7 @@ Base.inject(/** @lends Base# */{ statics: /** @lends Base */{ // Keep track of all named classes for serialization and exporting. - exports: new Base(), + exports: {}, extend: function extend(src) { // Override Base.extend() to register named classes in Base.exports, diff --git a/src/export.js b/src/export.js index bf1323c4..abc438ed 100644 --- a/src/export.js +++ b/src/export.js @@ -12,7 +12,7 @@ // First add Base, PaperScript and Numerical to exports, then inject all exports // into PaperScope, and create the initial paper object, all in one statement: -paper = new (PaperScope.inject(Base.exports.inject({ +paper = new (PaperScope.inject(Base.merge(Base.exports, { // Mark fields as enumeralbe so PaperScope.inject can pick them up enumerable: true, Base: Base,