Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix fucking inheritance again.
  • Loading branch information
mde committed Apr 13, 2013
1 parent ad2dd5f commit 7ad2a9f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/index.js
Expand Up @@ -62,6 +62,8 @@ utils.mixin(model, new (function () {
this.validators = require('./validators');
this.formatters = require('./formatters');

util.inherits(this.ModelBase, EventEmitter);

var _createModelItemConstructor = function (def) {
// Base constructor function for all model items
var ModelItemConstructor = function (params) {
Expand Down Expand Up @@ -697,8 +699,6 @@ utils.mixin(model, new (function () {
utils.mixin(origProto, defined);

ModelCtor.prototype = new model.ModelBase();
// Add eventing to instances
util.inherits(ModelCtor, EventEmitter);
// Preserve any inherited shit from the definition proto
utils.enhance(ModelCtor.prototype, origProto);

Expand Down
2 changes: 2 additions & 0 deletions test/events.js
Expand Up @@ -4,6 +4,8 @@ var model = require('../lib')
, User = require('./fixtures/user').User
, Profile = require('./fixtures/profile').Profile
, Account = require('./fixtures/account').Account
, Membership = require('./fixtures/membership').Membership
, Team = require('./fixtures/team').Team
, BaseAdapter = require('../lib/adapters/base_adapter').BaseAdapter
, EventEmitter = require('events').EventEmitter
, _params
Expand Down

0 comments on commit 7ad2a9f

Please sign in to comment.