Skip to content

Commit

Permalink
Don't use instanceof to determine if a Context is a Context
Browse files Browse the repository at this point in the history
Fixes #743
  • Loading branch information
sethkinast authored and Seth Kinast committed Sep 11, 2016
1 parent dc1e1dc commit ae69314
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
7 changes: 6 additions & 1 deletion lib/dust.js
Original file line number Diff line number Diff line change
Expand Up @@ -328,12 +328,17 @@
this.options = options;
this.blocks = blocks;
this.templateName = templateName;
this._isContext = true;
}

dust.makeBase = dust.context = function(global, options) {
return new Context(undefined, global, options);
};

dust.isContext = function(obj) {
return typeof obj === "object" && obj._isContext === true;
};

/**
* Factory function that creates a closure scope around a Thenable-callback.
* Returns a function that can be passed to a Thenable that will resume a
Expand All @@ -347,7 +352,7 @@
}

Context.wrap = function(context, name) {
if (context instanceof Context) {
if (dust.isContext(context)) {
context.templateName = name;
return context;
}
Expand Down
8 changes: 8 additions & 0 deletions test/core.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,14 @@
expect(base.options.lang).toEqual(opts.lang);
});
});

describe('prototype', function() {
var base = dust.context({
sayHello: function() { return "Hello!"; }
}).push({ foo: 'bar' });
var context = extend({}, base);
renderIt('survives having its prototype destroyed', '{sayHello} {foo}', context, 'Hello! bar');
});
});

it("valid keys", function() {
Expand Down

0 comments on commit ae69314

Please sign in to comment.