Permalink
Browse files

update to latest Spine

  • Loading branch information...
1 parent 4cc7cb4 commit 486a0787ae6067410f9e21ce11d24c1ee7948c63 @maccman committed Apr 22, 2011
Showing with 4 additions and 4 deletions.
  1. +3 −3 lib/spine.js
  2. +1 −1 lib/spine.model.filter.js
View
@@ -85,7 +85,7 @@
return new F();
};
- var moduleKeywords = ["included", "extended", "setup"];
+ var moduleKeywords = ["included", "extended"];
var Class = Spine.Class = {
inherited: function(){},
@@ -134,7 +134,7 @@
if (moduleKeywords.indexOf(key) == -1)
this.fn[key] = obj[key];
- var included = obj.included || obj.setup;
+ var included = obj.included;
if (included) included.apply(this);
return this;
},
@@ -144,7 +144,7 @@
if (moduleKeywords.indexOf(key) == -1)
this[key] = obj[key];
- var extended = obj.extended || obj.setup;
+ var extended = obj.extended;
if (extended) extended.apply(this);
return this;
}
@@ -25,7 +25,7 @@
};
Spine.Model.Filter = {
- setup: function(){
+ extended: function(){
this.extend(extend);
this.include(include);
}

0 comments on commit 486a078

Please sign in to comment.