Permalink
Browse files

update to latest Spine

  • Loading branch information...
maccman committed Apr 13, 2011
1 parent e0816c5 commit 1fa30042985725515d5dbf51f94311619c8fcec8
Showing with 9 additions and 9 deletions.
  1. +1 −1 app/controllers/contacts.js
  2. +1 −1 app/controllers/sidebar.js
  3. +6 −6 lib/spine.js
  4. +1 −1 lib/spine.list.js
@@ -14,7 +14,7 @@ jQuery(function($){
"click .optSave": "save"
},
- scoped: ["render", "show", "edit"],
+ proxied: ["render", "show", "edit"],
init: function(){
this.editEl.hide();
@@ -18,7 +18,7 @@ window.Sidebar = Spine.Controller.create({
// Ensure these functions are called with the current
// scope as they're used in event callbacks
- scoped: ["render"],
+ proxied: ["render"],
// Render template
template: function(items){
View
@@ -94,7 +94,7 @@
var moduleKeywords = ["included", "extended", "setup"];
- var Klass = Spine.Klass = {
+ var Class = Spine.Class = {
initializer: function(){},
init: function(){},
@@ -159,8 +159,8 @@
}
};
- Klass.prototype.proxy = Klass.proxy;
- Klass.prototype.proxyAll = Klass.proxyAll;
+ Class.prototype.proxy = Class.proxy;
+ Class.prototype.proxyAll = Class.proxyAll;
// Models
@@ -171,7 +171,7 @@
}).toUpperCase();
};
- var Model = Spine.Model = Klass.create();
+ var Model = Spine.Model = Class.create();
Model.extend(Events);
@@ -437,7 +437,7 @@
// Controllers
- var Controller = Spine.Controller = Klass.create({
+ var Controller = Spine.Controller = Class.create({
tag: "div",
initializer: function(options){
@@ -454,7 +454,7 @@
if (this.events) this.delegateEvents();
if (this.elements) this.refreshElements();
- if (this.scoped) this.proxyAll.apply(this, this.scoped);
+ if (this.proxied) this.proxyAll.apply(this, this.proxied);
},
render: function(){},
View
@@ -5,7 +5,7 @@
"click .item": "click"
},
- scoped: ["change"],
+ proxied: ["change"],
init: function(){
this.bind("change", this.change);

0 comments on commit 1fa3004

Please sign in to comment.