From 73ee1f89fe4e058feca6fc893f04823dd353ad6c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 18 Aug 2013 15:32:03 -0700 Subject: [PATCH] No need for custom header for series status --- UI/Series/Index/SeriesIndexLayout.js | 5 +- .../Index/Table/SeriesStatusHeaderCell.js | 58 ------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 UI/Series/Index/Table/SeriesStatusHeaderCell.js diff --git a/UI/Series/Index/SeriesIndexLayout.js b/UI/Series/Index/SeriesIndexLayout.js index 6ee8b1da9..99ba4ae1e 100644 --- a/UI/Series/Index/SeriesIndexLayout.js +++ b/UI/Series/Index/SeriesIndexLayout.js @@ -47,10 +47,9 @@ define( columns: [ { - name : 'status', + name : 'statusWeight', label : '', - cell : SeriesStatusCell, - headerCell: SeriesStatusHeaderCell + cell : SeriesStatusCell }, { name : 'title', diff --git a/UI/Series/Index/Table/SeriesStatusHeaderCell.js b/UI/Series/Index/Table/SeriesStatusHeaderCell.js deleted file mode 100644 index 4d398cdc5..000000000 --- a/UI/Series/Index/Table/SeriesStatusHeaderCell.js +++ /dev/null @@ -1,58 +0,0 @@ -'use strict'; - -define( - [ - 'backgrid', - 'Shared/Grid/HeaderCell' - ], function (Backgrid, NzbDroneHeaderCell) { - - Backgrid.SeriesStatusHeaderCell = NzbDroneHeaderCell.extend({ - events: { - 'click': 'onClick' - }, - - onClick: function (e) { - e.preventDefault(); - - var self = this; - var columnName = this.column.get('name'); - - if (this.column.get('sortable')) { - if (this.direction() === 'ascending') { - this.sort(columnName, 'descending', function (left, right) { - var leftVal = self._getStatus(left); - var rightVal = self._getStatus(right); - - return self._comparator(leftVal, rightVal) - }); - } - else { - this.sort(columnName, 'ascending', function (left, right) { - var leftVal = self._getStatus(left); - var rightVal = self._getStatus(right); - - return self._comparator(rightVal, leftVal) - }); - } - } - }, - - _comparator: function (leftVal, rightVal) { - if (leftVal === rightVal) { - return 0; - } - - if (leftVal > rightVal) { - return -1; - } - - return 1; - }, - - _getStatus: function (obj) { - return obj.get('statusWeight'); - } - }); - - return Backgrid.SeriesStatusHeaderCell; - });