From c39237bcbd4aa992160c5db3bd52b0e88990791e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Dahlgren?= Date: Tue, 29 Dec 2015 16:48:32 +0100 Subject: [PATCH] Implement sorting for most collections --- public/js/app/collections/logs.js | 9 +++++---- public/js/app/collections/missions.js | 9 +++++---- public/js/app/collections/mods.js | 11 ++++++----- public/js/app/collections/servers.js | 3 +++ public/js/app/router.js | 4 ++-- 5 files changed, 21 insertions(+), 15 deletions(-) diff --git a/public/js/app/collections/logs.js b/public/js/app/collections/logs.js index 33d0be8..411caec 100644 --- a/public/js/app/collections/logs.js +++ b/public/js/app/collections/logs.js @@ -1,15 +1,16 @@ define(function (require) { - + "use strict"; - + var $ = require('jquery'), _ = require('underscore'), Backbone = require('backbone'), Log = require('app/models/log'); - + return Backbone.Collection.extend({ + comparator: 'name', model: Log, url: '/api/logs/' }); - + }); diff --git a/public/js/app/collections/missions.js b/public/js/app/collections/missions.js index b52a06e..97e148b 100644 --- a/public/js/app/collections/missions.js +++ b/public/js/app/collections/missions.js @@ -1,15 +1,16 @@ define(function (require) { - + "use strict"; - + var $ = require('jquery'), _ = require('underscore'), Backbone = require('backbone'), Mission = require('app/models/mission'); - + return Backbone.Collection.extend({ + comparator: 'name', model: Mission, url: '/api/missions/' }); - + }); diff --git a/public/js/app/collections/mods.js b/public/js/app/collections/mods.js index c95ac31..7833b1a 100644 --- a/public/js/app/collections/mods.js +++ b/public/js/app/collections/mods.js @@ -1,15 +1,16 @@ define(function (require) { - + "use strict"; - + var $ = require('jquery'), _ = require('underscore'), Backbone = require('backbone'), Mod = require('app/models/mod'); - + return Backbone.Collection.extend({ + comparator: 'name', model: Mod, url: '/api/mods/' }); - -}); \ No newline at end of file + +}); diff --git a/public/js/app/collections/servers.js b/public/js/app/collections/servers.js index ef9b882..f0aaa21 100644 --- a/public/js/app/collections/servers.js +++ b/public/js/app/collections/servers.js @@ -8,6 +8,9 @@ define(function (require) { Server = require('app/models/server'); return Backbone.Collection.extend({ + comparator: function (a, b) { + return a.get('title').toLowerCase().localeCompare(b.get('title').toLowerCase()); + }, model: Server, url: '/api/servers/' }); diff --git a/public/js/app/router.js b/public/js/app/router.js index c48e5b3..637e70e 100644 --- a/public/js/app/router.js +++ b/public/js/app/router.js @@ -41,10 +41,10 @@ define(function (require) { var socket = io.connect(); socket.on('mods', function (_mods) { - mods.set(_mods); + mods.set(_mods).sort(); }); socket.on('servers', function (_servers) { - servers.set(_servers); + servers.set(_servers).sort(); if (!initialized) { initialized = true;