Comparing version 0.4.4 to 0.4.5
##CHANGE LOG | ||
- 0.4.5 | ||
- status: Alpha | ||
- Fixed issue with Traits/Talents required methods check with traits defined in different modules. | ||
- 0.4.4 | ||
@@ -4,0 +8,0 @@ - status: Alpha |
@@ -12,3 +12,3 @@ /* | ||
Requires.requiredMethod = function required(){ throw new Error('method is marked as required but it has not been defined');}; | ||
Requires.requiredMethod = function $$required$$(){ throw new Error('method is marked as required but it has not been defined');}; | ||
@@ -15,0 +15,0 @@ Requires.prototype = { |
@@ -73,8 +73,9 @@ /* | ||
_raiseErrorIfConflict: function(methodName, subjectProto, traitProto){ | ||
var subjectMethod = subjectProto[methodName], | ||
var requiredMethodName = Requires.requiredMethod.name, | ||
subjectMethod = subjectProto[methodName], | ||
traitMethod = traitProto[methodName], | ||
sameMethodName = (subjectMethod && traitMethod), | ||
methodsAreNotTheSame = (subjectMethod !== traitMethod), | ||
traitMethodIsNotARequired = (traitMethod !== Requires.requiredMethod), | ||
subjecMethodIsNotARequired = (subjectMethod !== Requires.requiredMethod); | ||
methodsAreNotTheSame = sameMethodName && (subjectMethod !== traitMethod), | ||
traitMethodIsNotARequired = sameMethodName && (traitMethod.name !== requiredMethodName), | ||
subjecMethodIsNotARequired = sameMethodName && (subjectMethod.name !== requiredMethodName); | ||
@@ -81,0 +82,0 @@ |
{ | ||
"name": "cocktail", | ||
"description": "CocktailJS is a small library to explore traits, talents, inheritance and annotations concepts in nodejs - Shake your objects and classes with Cocktail!", | ||
"version": "0.4.4", | ||
"version": "0.4.5", | ||
"homepage": "http://cocktailjs.github.io", | ||
@@ -6,0 +6,0 @@ "author": { |
30491
710
252