Merge pull request #939 from pgilad/gh-pages

improve collection flow in backbone examples

architecture-examples/backbone/js/collections/todos.js

@@ -29,17 +29,11 @@ var app = app || {};
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function () {
-			if (!this.length) {
-				return 1;
-			}
-
-			return this.last().get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function (todo) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.

dependency-examples/backbone_require/js/collections/todos.js

@@ -27,17 +27,11 @@ define([
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function () {
-			if (!this.length) {
-				return 1;
-			}
-
-			return this.last().get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function (todo) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	return new TodosCollection();

labs/architecture-examples/backbone_marionette/js/TodoMVC.Todos.js

@@ -41,9 +41,7 @@ TodoMVC.module('Todos', function (Todos, App, Backbone) {
 			return this.reject(this._isCompleted);
 		},
 
-		comparator: function (todo) {
-			return todo.get('created');
-		},
+		comparator: 'created',
 
 		_isCompleted: function (todo) {
 			return todo.isCompleted();

labs/architecture-examples/exoskeleton/js/collections/todos.js

@@ -18,31 +18,22 @@ var app = app || {};
 
 		// Filter down the list of all todo items that are finished.
 		completed: function () {
-			return this.filter(function (todo) {
-				return todo.get('completed');
-			});
+			return this.where({completed: true});
 		},
 
 		// Filter down the list to only todo items that are still not finished.
 		remaining: function () {
-			return this.filter(function (todo) {
-				return !todo.get('completed');
-			});
+			return this.where({completed: false});
 		},
 
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function () {
-			if (!this.length) {
-				return 1;
-			}
-			return this.at(this.length - 1).get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function (todo) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.

labs/architecture-examples/react-backbone/js/todos.js

@@ -18,29 +18,22 @@ var app = app || {};
 
 		// Filter down the list of all todo items that are finished.
 		completed: function () {
-			return this.filter(function (todo) {
-				return todo.get('completed');
-			});
+			return this.where({completed: true});
 		},
 
 		// Filter down the list to only todo items that are still not finished.
 		remaining: function () {
-			return this.without.apply(this, this.completed());
+			return this.where({completed: false});
 		},
 
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function () {
-			if (!this.length) {
-				return 1;
-			}
-			return this.last().get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function (todo) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.

labs/architecture-examples/thorax/js/collections/todos.js

@@ -17,29 +17,22 @@
 
 		// Filter down the list of all todo items that are finished.
 		completed: function () {
-			return this.filter(function (todo) {
-				return todo.get('completed');
-			});
+			return this.where({completed: true});
 		},
 
 		// Filter down the list to only todo items that are still not finished.
 		remaining: function () {
-			return this.without.apply(this, this.completed());
+			return this.where({completed: false});
 		},
 
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function () {
-			if (!this.length) {
-				return 1;
-			}
-			return this.last().get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function (todo) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.

labs/dependency-examples/backbone_marionette_require/js/collections/TodoList.js

@@ -19,8 +19,6 @@ define([
 			return this.where({completed: false});
 		},
 
-		comparator: function (todo) {
-			return todo.get('created');
-		}
+		comparator: 'created'
 	});
 });

labs/dependency-examples/thorax_lumbar/public/todomvc.js

@@ -63,29 +63,22 @@ module.routes = {"":"setFilter",":filter":"setFilter"};
 
 		// Filter down the list of all todo items that are finished.
 		completed: function() {
-			return this.filter(function( todo ) {
-				return todo.get('completed');
-			});
+			return this.where({completed: true});
 		},
 
 		// Filter down the list to only todo items that are still not finished.
 		remaining: function() {
-			return this.without.apply( this, this.completed() );
+			return this.where({completed: false});
 		},
 
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
 		nextOrder: function() {
-			if ( !this.length ) {
-				return 1;
-			}
-			return this.last().get('order') + 1;
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function( todo ) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.

labs/dependency-examples/thorax_lumbar/src/js/collections/todos.js

@@ -15,30 +15,23 @@
 		localStorage: new Store('todos-backbone-thorax'),
 
 		// Filter down the list of all todo items that are finished.
-		completed: function() {
-			return this.filter(function( todo ) {
-				return todo.get('completed');
-			});
+		completed: function () {
+			return this.where({completed: true});
 		},
 
 		// Filter down the list to only todo items that are still not finished.
-		remaining: function() {
-			return this.without.apply( this, this.completed() );
+		remaining: function () {
+			return this.where({completed: false});
 		},
 
 		// We keep the Todos in sequential order, despite being saved by unordered
 		// GUID in the database. This generates the next order number for new items.
-		nextOrder: function() {
-			if ( !this.length ) {
-				return 1;
-			}
-			return this.last().get('order') + 1;
+		nextOrder: function () {
+			return this.length ? this.last().get('order') + 1 : 1;
 		},
 
 		// Todos are sorted by their original insertion order.
-		comparator: function( todo ) {
-			return todo.get('order');
-		}
+		comparator: 'order'
 	});
 
 	// Create our global collection of **Todos**.