From ea1902001579fe8153542ff2384bbde379bcf45c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 16 Jul 2015 22:57:10 -0700 Subject: [PATCH] Fixed: Sorting by timeleft on Activity: Queue --- src/UI/Activity/Queue/QueueCollection.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/UI/Activity/Queue/QueueCollection.js b/src/UI/Activity/Queue/QueueCollection.js index 9d1514a2f..068e09f1e 100644 --- a/src/UI/Activity/Queue/QueueCollection.js +++ b/src/UI/Activity/Queue/QueueCollection.js @@ -3,6 +3,7 @@ var PageableCollection = require('backbone.pageable'); var QueueModel = require('./QueueModel'); var FormatHelpers = require('../../Shared/FormatHelpers'); var AsSortedCollection = require('../../Mixins/AsSortedCollection'); +var moment = require('moment'); require('../../Mixins/backbone.signalr.mixin'); @@ -11,7 +12,8 @@ var QueueCollection = PageableCollection.extend({ model : QueueModel, state : { - pageSize : 15 + pageSize : 15, + sortKey: 'timeleft' }, mode : 'client', @@ -45,6 +47,18 @@ var QueueCollection = PageableCollection.extend({ return episode.get('title'); } + }, + + timeleft : { + sortValue : function(model, attr) { + var eta = model.get('estimatedCompletionTime'); + + if (eta) { + return moment(eta).unix(); + } + + return Number.MAX_VALUE; + } } } });