mirror of https://github.com/Sonarr/Sonarr
Massive backgrid update, only one header cell left
This commit is contained in:
parent
874e98b408
commit
7e20e48023
|
@ -1,69 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
define(
|
||||
[
|
||||
'backgrid',
|
||||
'Shared/Grid/HeaderCell'
|
||||
], function (Backgrid, NzbDroneHeaderCell) {
|
||||
|
||||
Backgrid.QualityHeaderCell = 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 = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
|
||||
return self._comparator(leftVal, rightVal);
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.sort(columnName, 'ascending', function (left, right) {
|
||||
var leftVal = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
|
||||
return self._comparator(rightVal, leftVal);
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
_comparator: function (leftVal, rightVal) {
|
||||
var leftWeight = leftVal.quality.weight;
|
||||
var rightWeight = rightVal.quality.weight;
|
||||
|
||||
if (!leftWeight && !rightWeight) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!leftWeight) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!rightWeight) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (leftWeight === rightWeight) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (leftWeight > rightWeight) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
});
|
||||
|
||||
return Backgrid.QualityHeaderCell;
|
||||
});
|
|
@ -6,10 +6,8 @@ define(
|
|||
'Cells/FileSizeCell',
|
||||
'Cells/QualityCell',
|
||||
'Cells/ApprovalStatusCell',
|
||||
'Release/DownloadReportCell',
|
||||
'Cells/Header/QualityHeaderCell'
|
||||
|
||||
], function (Marionette, Backgrid, FileSizeCell, QualityCell, ApprovalStatusCell, DownloadReportCell, QualityHeaderCell) {
|
||||
'Release/DownloadReportCell'
|
||||
], function (Marionette, Backgrid, FileSizeCell, QualityCell, ApprovalStatusCell, DownloadReportCell) {
|
||||
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Episode/Search/ManualLayoutTemplate',
|
||||
|
@ -49,7 +47,9 @@ define(
|
|||
label : 'Quality',
|
||||
sortable : true,
|
||||
cell : QualityCell,
|
||||
headerCell: QualityHeaderCell
|
||||
sortValue : function (model) {
|
||||
return model.get('quality').quality.weight;
|
||||
}
|
||||
},
|
||||
|
||||
{
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,19 +5,202 @@
|
|||
Copyright (c) 2013 Jimmy Yuen Ho Wong and contributors
|
||||
Licensed under the MIT @license.
|
||||
*/
|
||||
(function (factory) {
|
||||
|
||||
(function ($, _, Backbone, Backgrid) {
|
||||
// CommonJS
|
||||
if (typeof exports == "object") {
|
||||
module.exports = factory(require("underscore"),
|
||||
require("backbone"),
|
||||
require("backgrid"),
|
||||
require("backbone-pageable"));
|
||||
}
|
||||
// Browser
|
||||
else if (typeof _ !== "undefined" &&
|
||||
typeof Backbone !== "undefined" &&
|
||||
typeof Backgrid !== "undefined") {
|
||||
factory(_, Backbone, Backgrid);
|
||||
}
|
||||
|
||||
}(function (_, Backbone, Backgrid) {
|
||||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
PageHandle is a class that renders the actual page handles and reacts to
|
||||
click events for pagination.
|
||||
|
||||
This class acts in two modes - control or discrete page handle modes. If
|
||||
one of the `is*` flags is `true`, an instance of this class is under
|
||||
control page handle mode. Setting a `pageIndex` to an instance of this
|
||||
class under control mode has no effect and the correct page index will
|
||||
always be inferred from the `is*` flag. Only one of the `is*` flags should
|
||||
be set to `true` at a time. For example, an instance of this class cannot
|
||||
simultaneously be a rewind control and a fast forward control. A `label`
|
||||
and a `title` template or a string are required to be passed to the
|
||||
constuctor under this mode. If a `title` template is provided, it __MUST__
|
||||
accept a parameter `label`. When the `label` is provided to the `title`
|
||||
template function, its result will be used to render the generated anchor's
|
||||
title attribute.
|
||||
|
||||
If all of the `is*` flags is set to `false`, which is the default, an
|
||||
instance of this class will be in discrete page handle mode. An instance
|
||||
under this mode requires the `pageIndex` to be passed from the constructor
|
||||
as an option and it __MUST__ be a 0-based index of the list of page numbers
|
||||
to render. The constuctor will normalize the base to the same base the
|
||||
underlying PageableCollection collection instance uses. A `label` is not
|
||||
required under this mode, which will default to the equivalent 1-based page
|
||||
index calculated from `pageIndex` and the underlying PageableCollection
|
||||
instance. A provided `label` will still be honored however. The `title`
|
||||
parameter is also not required under this mode, in which case the default
|
||||
`title` template will be used. You are encouraged to provide your own
|
||||
`title` template however if you wish to localize the title strings.
|
||||
|
||||
If this page handle represents the current page, an `active` class will be
|
||||
placed on the root list element.
|
||||
|
||||
if this page handle is at the border of the list of pages, a `disabled`
|
||||
class will be placed on the root list element.
|
||||
|
||||
Only page handles that are neither `active` nor `disabled` will respond to
|
||||
click events and triggers pagination.
|
||||
|
||||
@class Backgrid.Extension.PageHandle
|
||||
*/
|
||||
var PageHandle = Backgrid.Extension.PageHandle = Backbone.View.extend({
|
||||
|
||||
/** @property */
|
||||
tagName: "li",
|
||||
|
||||
/** @property */
|
||||
events: {
|
||||
"click a": "changePage"
|
||||
},
|
||||
|
||||
/**
|
||||
@property {string|function(Object.<string, string>): string} title
|
||||
The title to use for the `title` attribute of the generated page handle
|
||||
anchor elements. It can be a string or an Underscore template function
|
||||
that takes a mandatory `label` parameter.
|
||||
*/
|
||||
title: _.template('Page <%- label %>', null, {variable: null}),
|
||||
|
||||
/**
|
||||
@property {boolean} isRewind Whether this handle represents a rewind
|
||||
control
|
||||
*/
|
||||
isRewind: false,
|
||||
|
||||
/**
|
||||
@property {boolean} isBack Whether this handle represents a back
|
||||
control
|
||||
*/
|
||||
isBack: false,
|
||||
|
||||
/**
|
||||
@property {boolean} isForward Whether this handle represents a forward
|
||||
control
|
||||
*/
|
||||
isForward: false,
|
||||
|
||||
/**
|
||||
@property {boolean} isFastForward Whether this handle represents a fast
|
||||
forward control
|
||||
*/
|
||||
isFastForward: false,
|
||||
|
||||
/**
|
||||
Initializer.
|
||||
|
||||
@param {Object} options
|
||||
@param {Backbone.Collection} options.collection
|
||||
@param {number} pageIndex 0-based index of the page number this handle
|
||||
handles. This parameter will be normalized to the base the underlying
|
||||
PageableCollection uses.
|
||||
@param {string} [options.label] If provided it is used to render the
|
||||
anchor text, otherwise the normalized pageIndex will be used
|
||||
instead. Required if any of the `is*` flags is set to `true`.
|
||||
@param {string} [options.title]
|
||||
@param {boolean} [options.isRewind=false]
|
||||
@param {boolean} [options.isBack=false]
|
||||
@param {boolean} [options.isForward=false]
|
||||
@param {boolean} [options.isFastForward=false]
|
||||
*/
|
||||
initialize: function (options) {
|
||||
Backbone.View.prototype.initialize.apply(this, arguments);
|
||||
|
||||
var collection = this.collection;
|
||||
var state = collection.state;
|
||||
var currentPage = state.currentPage;
|
||||
var firstPage = state.firstPage;
|
||||
var lastPage = state.lastPage;
|
||||
|
||||
_.extend(this, _.pick(options,
|
||||
["isRewind", "isBack", "isForward", "isFastForward"]));
|
||||
|
||||
var pageIndex;
|
||||
if (this.isRewind) pageIndex = firstPage;
|
||||
else if (this.isBack) pageIndex = Math.max(firstPage, currentPage - 1);
|
||||
else if (this.isForward) pageIndex = Math.min(lastPage, currentPage + 1);
|
||||
else if (this.isFastForward) pageIndex = lastPage;
|
||||
else {
|
||||
pageIndex = +options.pageIndex;
|
||||
pageIndex = (firstPage ? pageIndex + 1 : pageIndex);
|
||||
}
|
||||
this.pageIndex = pageIndex;
|
||||
|
||||
if (((this.isRewind || this.isBack) && currentPage == firstPage) ||
|
||||
((this.isForward || this.isFastForward) && currentPage == lastPage)) {
|
||||
this.$el.addClass("disabled");
|
||||
}
|
||||
else if (!(this.isRewind ||
|
||||
this.isBack ||
|
||||
this.isForward ||
|
||||
this.isFastForward) &&
|
||||
currentPage == pageIndex) {
|
||||
this.$el.addClass("active");
|
||||
}
|
||||
|
||||
this.label = (options.label || (firstPage ? pageIndex : pageIndex + 1)) + '';
|
||||
var title = options.title || this.title;
|
||||
this.title = _.isFunction(title) ? title({label: this.label}) : title;
|
||||
},
|
||||
|
||||
/**
|
||||
Renders a clickable anchor element under a list item.
|
||||
*/
|
||||
render: function () {
|
||||
this.$el.empty();
|
||||
var anchor = document.createElement("a");
|
||||
anchor.href = '#';
|
||||
if (this.title) anchor.title = this.title;
|
||||
anchor.innerHTML = this.label;
|
||||
this.el.appendChild(anchor);
|
||||
this.delegateEvents();
|
||||
return this;
|
||||
},
|
||||
|
||||
/**
|
||||
jQuery click event handler. Goes to the page this PageHandle instance
|
||||
represents. No-op if this page handle is currently active or disabled.
|
||||
*/
|
||||
changePage: function (e) {
|
||||
e.preventDefault();
|
||||
var $el = this.$el;
|
||||
if (!$el.hasClass("active") && !$el.hasClass("disabled")) {
|
||||
this.collection.getPage(this.pageIndex);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
/**
|
||||
Paginator is a Backgrid extension that renders a series of configurable
|
||||
pagination handles. This extension is best used for splitting a large data
|
||||
set across multiple pages. If the number of pages is larger then a
|
||||
threshold, which is set to 10 by default, the page handles are rendered
|
||||
within a sliding window, plus the fast forward, fast backward, previous and
|
||||
next page handles. The fast forward, fast backward, previous and next page
|
||||
handles can be turned off.
|
||||
within a sliding window, plus the rewind, back, forward and fast forward
|
||||
control handles. The individual control handles can be turned off.
|
||||
|
||||
@class Backgrid.Extension.Paginator
|
||||
*/
|
||||
|
@ -30,97 +213,63 @@
|
|||
windowSize: 10,
|
||||
|
||||
/**
|
||||
@property {Object} fastForwardHandleLabels You can disable specific
|
||||
handles by setting its value to `null`.
|
||||
@property {Object.<string, Object.<string, string>>} controls You can
|
||||
disable specific control handles by omitting certain keys.
|
||||
*/
|
||||
fastForwardHandleLabels: {
|
||||
first: "《",
|
||||
prev: "〈",
|
||||
next: "〉",
|
||||
last: "》"
|
||||
controls: {
|
||||
rewind: {
|
||||
label: "《",
|
||||
title: "First"
|
||||
},
|
||||
back: {
|
||||
label: "〈",
|
||||
title: "Previous"
|
||||
},
|
||||
forward: {
|
||||
label: "〉",
|
||||
title: "Next"
|
||||
},
|
||||
fastForward: {
|
||||
label: "》",
|
||||
title: "Last"
|
||||
}
|
||||
},
|
||||
|
||||
/** @property */
|
||||
template: _.template('<ul><% _.each(handles, function (handle) { %><li <% if (handle.className) { %>class="<%= handle.className %>"<% } %>><a href="#" <% if (handle.title) {%> title="<%= handle.title %>"<% } %>><%= handle.label %></a></li><% }); %></ul>'),
|
||||
/**
|
||||
@property {Backgrid.Extension.PageHandle} pageHandle. The PageHandle
|
||||
class to use for rendering individual handles
|
||||
*/
|
||||
pageHandle: PageHandle,
|
||||
|
||||
/** @property */
|
||||
events: {
|
||||
"click a": "changePage"
|
||||
},
|
||||
goBackFirstOnSort: true,
|
||||
|
||||
/**
|
||||
Initializer.
|
||||
|
||||
@param {Object} options
|
||||
@param {Backbone.Collection} options.collection
|
||||
@param {boolean} [options.fastForwardHandleLabels] Whether to render fast forward buttons.
|
||||
@param {boolean} [options.controls]
|
||||
@param {boolean} [options.pageHandle=Backgrid.Extension.PageHandle]
|
||||
@param {boolean} [options.goBackFirstOnSort=true]
|
||||
*/
|
||||
initialize: function (options) {
|
||||
Backgrid.requireOptions(options, ["collection"]);
|
||||
this.controls = options.controls || this.controls;
|
||||
this.pageHandle = options.pageHandle || this.pageHandle;
|
||||
|
||||
var collection = this.collection;
|
||||
var fullCollection = collection.fullCollection;
|
||||
if (fullCollection) {
|
||||
this.listenTo(fullCollection, "add", this.render);
|
||||
this.listenTo(fullCollection, "remove", this.render);
|
||||
this.listenTo(fullCollection, "reset", this.render);
|
||||
}
|
||||
else {
|
||||
this.listenTo(collection, "add", this.render);
|
||||
this.listenTo(collection, "remove", this.render);
|
||||
this.listenTo(collection, "reset", this.render);
|
||||
this.listenTo(collection, "add", this.render);
|
||||
this.listenTo(collection, "remove", this.render);
|
||||
this.listenTo(collection, "reset", this.render);
|
||||
if ((options.goBackFirstOnSort || this.goBackFirstOnSort) &&
|
||||
collection.fullCollection) {
|
||||
this.listenTo(collection.fullCollection, "sort", function () {
|
||||
collection.getFirstPage();
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
jQuery event handler for the page handlers. Goes to the right page upon
|
||||
clicking.
|
||||
|
||||
@param {Event} e
|
||||
*/
|
||||
changePage: function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
var $li = $(e.target).parent();
|
||||
if (!$li.hasClass("active") && !$li.hasClass("disabled")) {
|
||||
|
||||
var label = $(e.target).text();
|
||||
var ffLabels = this.fastForwardHandleLabels;
|
||||
|
||||
var collection = this.collection;
|
||||
|
||||
if (ffLabels) {
|
||||
switch (label) {
|
||||
case ffLabels.first:
|
||||
collection.getFirstPage();
|
||||
return;
|
||||
case ffLabels.prev:
|
||||
collection.getPreviousPage();
|
||||
return;
|
||||
case ffLabels.next:
|
||||
collection.getNextPage();
|
||||
return;
|
||||
case ffLabels.last:
|
||||
collection.getLastPage();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
var state = collection.state;
|
||||
var pageIndex = +label;
|
||||
collection.getPage(state.firstPage === 0 ? pageIndex - 1 : pageIndex);
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
Internal method to create a list of page handle objects for the template
|
||||
to render them.
|
||||
|
||||
@return {Array.<Object>} an array of page handle objects hashes
|
||||
*/
|
||||
makeHandles: function () {
|
||||
|
||||
var handles = [];
|
||||
_calculateWindow: function () {
|
||||
var collection = this.collection;
|
||||
var state = collection.state;
|
||||
|
||||
|
@ -132,48 +281,44 @@
|
|||
currentPage = firstPage ? currentPage - 1 : currentPage;
|
||||
var windowStart = Math.floor(currentPage / this.windowSize) * this.windowSize;
|
||||
var windowEnd = Math.min(lastPage + 1, windowStart + this.windowSize);
|
||||
return [windowStart, windowEnd];
|
||||
},
|
||||
|
||||
if (collection.mode !== "infinite") {
|
||||
for (var i = windowStart; i < windowEnd; i++) {
|
||||
handles.push({
|
||||
label: i + 1,
|
||||
title: "No. " + (i + 1),
|
||||
className: currentPage === i ? "active" : undefined
|
||||
});
|
||||
}
|
||||
/**
|
||||
Creates a list of page handle objects for rendering.
|
||||
|
||||
@return {Array.<Object>} an array of page handle objects hashes
|
||||
*/
|
||||
makeHandles: function () {
|
||||
|
||||
var handles = [];
|
||||
var collection = this.collection;
|
||||
|
||||
var window = this._calculateWindow();
|
||||
var winStart = window[0], winEnd = window[1];
|
||||
|
||||
for (var i = winStart; i < winEnd; i++) {
|
||||
handles.push(new this.pageHandle({
|
||||
collection: collection,
|
||||
pageIndex: i
|
||||
}));
|
||||
}
|
||||
|
||||
var ffLabels = this.fastForwardHandleLabels;
|
||||
if (ffLabels) {
|
||||
|
||||
if (ffLabels.prev) {
|
||||
handles.unshift({
|
||||
label: ffLabels.prev,
|
||||
className: collection.hasPrevious() ? void 0 : "disabled"
|
||||
});
|
||||
var controls = this.controls;
|
||||
_.each(["back", "rewind", "forward", "fastForward"], function (key) {
|
||||
var value = controls[key];
|
||||
if (value) {
|
||||
var handleCtorOpts = {
|
||||
collection: collection,
|
||||
title: value.title,
|
||||
label: value.label
|
||||
};
|
||||
handleCtorOpts["is" + key.slice(0, 1).toUpperCase() + key.slice(1)] = true;
|
||||
var handle = new this.pageHandle(handleCtorOpts);
|
||||
if (key == "rewind" || key == "back") handles.unshift(handle);
|
||||
else handles.push(handle);
|
||||
}
|
||||
|
||||
if (ffLabels.first) {
|
||||
handles.unshift({
|
||||
label: ffLabels.first,
|
||||
className: collection.hasPrevious() ? void 0 : "disabled"
|
||||
});
|
||||
}
|
||||
|
||||
if (ffLabels.next) {
|
||||
handles.push({
|
||||
label: ffLabels.next,
|
||||
className: collection.hasNext() ? void 0 : "disabled"
|
||||
});
|
||||
}
|
||||
|
||||
if (ffLabels.last) {
|
||||
handles.push({
|
||||
label: ffLabels.last,
|
||||
className: collection.hasNext() ? void 0 : "disabled"
|
||||
});
|
||||
}
|
||||
}
|
||||
}, this);
|
||||
|
||||
return handles;
|
||||
},
|
||||
|
@ -184,15 +329,24 @@
|
|||
render: function () {
|
||||
this.$el.empty();
|
||||
|
||||
this.$el.append(this.template({
|
||||
handles: this.makeHandles()
|
||||
}));
|
||||
if (this.handles) {
|
||||
for (var i = 0, l = this.handles.length; i < l; i++) {
|
||||
this.handles[i].remove();
|
||||
}
|
||||
}
|
||||
|
||||
this.delegateEvents();
|
||||
var handles = this.handles = this.makeHandles();
|
||||
|
||||
var ul = document.createElement("ul");
|
||||
for (var i = 0; i < handles.length; i++) {
|
||||
ul.appendChild(handles[i].render().el);
|
||||
}
|
||||
|
||||
this.el.appendChild(ul);
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
}(jQuery, _, Backbone, Backgrid));
|
||||
}));
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
backbone-pageable 1.3.2
|
||||
backbone-pageable 1.4.1
|
||||
http://github.com/wyuenho/backbone-pageable
|
||||
|
||||
Copyright (c) 2013 Jimmy Yuen Ho Wong
|
||||
|
@ -83,7 +83,7 @@
|
|||
for (var i = 0, l = kvps.length; i < l; i++) {
|
||||
var param = kvps[i];
|
||||
kvp = param.split('='), k = kvp[0], v = kvp[1] || true;
|
||||
k = decode(k), ls = params[k];
|
||||
k = decode(k), v = decode(v), ls = params[k];
|
||||
if (_isArray(ls)) ls.push(v);
|
||||
else if (ls) params[k] = [ls, v];
|
||||
else params[k] = v;
|
||||
|
@ -91,6 +91,29 @@
|
|||
return params;
|
||||
}
|
||||
|
||||
// hack to make sure the whatever event handlers for this event is run
|
||||
// before func is, and the event handlers that func will trigger.
|
||||
function runOnceAtLastHandler (col, event, func) {
|
||||
var eventHandlers = col._events[event];
|
||||
if (eventHandlers && eventHandlers.length) {
|
||||
var lastHandler = eventHandlers[eventHandlers.length - 1];
|
||||
var oldCallback = lastHandler.callback;
|
||||
lastHandler.callback = function () {
|
||||
try {
|
||||
oldCallback.apply(this, arguments);
|
||||
func();
|
||||
}
|
||||
catch (e) {
|
||||
throw e;
|
||||
}
|
||||
finally {
|
||||
lastHandler.callback = oldCallback;
|
||||
}
|
||||
};
|
||||
}
|
||||
else func();
|
||||
}
|
||||
|
||||
var PARAM_TRIM_RE = /[\s'"]/g;
|
||||
var URL_TRIM_RE = /[<>\s'"]/g;
|
||||
|
||||
|
@ -256,7 +279,7 @@
|
|||
*/
|
||||
constructor: function (models, options) {
|
||||
|
||||
Backbone.Collection.apply(this, arguments);
|
||||
BBColProto.constructor.apply(this, arguments);
|
||||
|
||||
options = options || {};
|
||||
|
||||
|
@ -299,7 +322,7 @@
|
|||
var fullCollection = this.fullCollection;
|
||||
|
||||
if (comparator && options.full) {
|
||||
delete this.comparator;
|
||||
this.comparator = null;
|
||||
fullCollection.comparator = comparator;
|
||||
}
|
||||
|
||||
|
@ -308,6 +331,7 @@
|
|||
// make sure the models in the current page and full collection have the
|
||||
// same references
|
||||
if (models && !_isEmpty(models)) {
|
||||
this.reset([].slice.call(models), _extend({silent: true}, options));
|
||||
this.getPage(state.currentPage);
|
||||
models.splice.apply(models, [0, models.length].concat(this.models));
|
||||
}
|
||||
|
@ -412,22 +436,10 @@
|
|||
pageCol.at(pageSize) :
|
||||
null;
|
||||
if (modelToRemove) {
|
||||
var addHandlers = collection._events.add || [],
|
||||
popOptions = {onAdd: true};
|
||||
if (addHandlers.length) {
|
||||
var lastAddHandler = addHandlers[addHandlers.length - 1];
|
||||
var oldCallback = lastAddHandler.callback;
|
||||
lastAddHandler.callback = function () {
|
||||
try {
|
||||
oldCallback.apply(this, arguments);
|
||||
pageCol.remove(modelToRemove, popOptions);
|
||||
}
|
||||
finally {
|
||||
lastAddHandler.callback = oldCallback;
|
||||
}
|
||||
};
|
||||
}
|
||||
else pageCol.remove(modelToRemove, popOptions);
|
||||
var popOptions = {onAdd: true};
|
||||
runOnceAtLastHandler(collection, event, function () {
|
||||
pageCol.remove(modelToRemove, popOptions);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -442,20 +454,25 @@
|
|||
}
|
||||
else {
|
||||
var totalPages = state.totalPages = ceil(state.totalRecords / pageSize);
|
||||
state.lastPage = firstPage === 0 ? totalPages - 1 : totalPages;
|
||||
state.lastPage = firstPage === 0 ? totalPages - 1 : totalPages || firstPage;
|
||||
if (state.currentPage > totalPages) state.currentPage = state.lastPage;
|
||||
}
|
||||
pageCol.state = pageCol._checkState(state);
|
||||
|
||||
var nextModel, removedIndex = options.index;
|
||||
if (collection == pageCol) {
|
||||
if (nextModel = fullCol.at(pageEnd)) pageCol.push(nextModel);
|
||||
if (nextModel = fullCol.at(pageEnd)) {
|
||||
runOnceAtLastHandler(pageCol, event, function () {
|
||||
pageCol.push(nextModel);
|
||||
});
|
||||
}
|
||||
fullCol.remove(model);
|
||||
}
|
||||
else if (removedIndex >= pageStart && removedIndex < pageEnd) {
|
||||
pageCol.remove(model);
|
||||
nextModel = fullCol.at(currentPage * (pageSize + removedIndex));
|
||||
if (nextModel) pageCol.push(nextModel);
|
||||
var at = removedIndex + 1
|
||||
nextModel = fullCol.at(at) || fullCol.last();
|
||||
if (nextModel) pageCol.add(nextModel, {at: at});
|
||||
}
|
||||
}
|
||||
else delete options.onAdd;
|
||||
|
@ -466,13 +483,13 @@
|
|||
collection = model;
|
||||
|
||||
// Reset that's not a result of getPage
|
||||
if (collection === pageCol && options.from == null &&
|
||||
if (collection == pageCol && options.from == null &&
|
||||
options.to == null) {
|
||||
var head = fullCol.models.slice(0, pageStart);
|
||||
var tail = fullCol.models.slice(pageStart + pageCol.models.length);
|
||||
fullCol.reset(head.concat(pageCol.models).concat(tail), options);
|
||||
}
|
||||
else if (collection === fullCol) {
|
||||
else if (collection == fullCol) {
|
||||
if (!(state.totalRecords = fullCol.models.length)) {
|
||||
state.totalRecords = null;
|
||||
state.totalPages = null;
|
||||
|
@ -551,7 +568,7 @@
|
|||
throw new RangeError("`firstPage must be 0 or 1`");
|
||||
}
|
||||
|
||||
state.lastPage = firstPage === 0 ? max(0, totalPages - 1) : totalPages;
|
||||
state.lastPage = firstPage === 0 ? max(0, totalPages - 1) : totalPages || firstPage;
|
||||
|
||||
if (mode == "infinite") {
|
||||
if (!links[currentPage + '']) {
|
||||
|
@ -561,6 +578,8 @@
|
|||
else if (currentPage < firstPage ||
|
||||
(totalPages > 0 &&
|
||||
(firstPage ? currentPage > totalPages : currentPage >= totalPages))) {
|
||||
var op = firstPage ? ">=" : ">";
|
||||
|
||||
throw new RangeError("`currentPage` must be firstPage <= currentPage " +
|
||||
(firstPage ? ">" : ">=") +
|
||||
" totalPages if " + firstPage + "-based. Got " +
|
||||
|
@ -681,7 +700,7 @@
|
|||
var fullCollection = this.fullCollection;
|
||||
var handlers = this._handlers = this._handlers || {}, handler;
|
||||
if (mode != "server" && !fullCollection) {
|
||||
fullCollection = this._makeFullCollection(options.models || []);
|
||||
fullCollection = this._makeFullCollection(options.models || [], options);
|
||||
fullCollection.pageableCollection = this;
|
||||
this.fullCollection = fullCollection;
|
||||
var allHandler = this._makeCollectionEventHandler(this, fullCollection);
|
||||
|
@ -856,7 +875,8 @@
|
|||
[];
|
||||
if ((mode == "client" || (mode == "infinite" && !_isEmpty(pageModels))) &&
|
||||
!options.fetch) {
|
||||
return this.reset(pageModels, _omit(options, "fetch"));
|
||||
this.reset(pageModels, _omit(options, "fetch"));
|
||||
return this;
|
||||
}
|
||||
|
||||
if (mode == "infinite") options.url = this.links[pageNum];
|
||||
|
@ -1310,8 +1330,8 @@
|
|||
this.comparator = comparator;
|
||||
}
|
||||
|
||||
if (delComp) delete this.comparator;
|
||||
if (delFullComp && fullCollection) delete fullCollection.comparator;
|
||||
if (delComp) this.comparator = null;
|
||||
if (delFullComp && fullCollection) fullCollection.comparator = null;
|
||||
|
||||
return this;
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@ define(
|
|||
'underscore',
|
||||
'marionette',
|
||||
'backgrid',
|
||||
'Missing/Collection',
|
||||
'Missing/MissingCollection',
|
||||
'Cells/SeriesTitleCell',
|
||||
'Cells/EpisodeNumberCell',
|
||||
'Cells/EpisodeTitleCell',
|
||||
|
@ -121,7 +121,6 @@ define(
|
|||
]
|
||||
};
|
||||
|
||||
|
||||
this.toolbar.show(new ToolbarLayout({
|
||||
left :
|
||||
[
|
||||
|
|
|
@ -14,7 +14,7 @@ define(
|
|||
throw 'tableName is required';
|
||||
}
|
||||
|
||||
_setState.call(this);
|
||||
_setInitialState.call(this);
|
||||
|
||||
this.on('backgrid:sort', _storeState, this);
|
||||
|
||||
|
@ -23,7 +23,7 @@ define(
|
|||
}
|
||||
};
|
||||
|
||||
var _setState = function () {
|
||||
var _setInitialState = function () {
|
||||
var key = Config.getValue('{0}.sortKey'.format(this.tableName), this.state.sortKey);
|
||||
var direction = Config.getValue('{0}.sortDirection'.format(this.tableName), this.state.order);
|
||||
var order = parseInt(direction, 10);
|
||||
|
@ -32,8 +32,9 @@ define(
|
|||
this.state.order = order;
|
||||
};
|
||||
|
||||
var _storeState = function (sortKey, sortDirection) {
|
||||
var _storeState = function (column, sortDirection) {
|
||||
var order = _convertDirectionToInt(sortDirection);
|
||||
var sortKey = column.get('name');
|
||||
|
||||
Config.setValue('{0}.sortKey'.format(this.tableName), sortKey);
|
||||
Config.setValue('{0}.sortDirection'.format(this.tableName), order);
|
||||
|
|
|
@ -13,12 +13,12 @@ define(
|
|||
'Cells/QualityProfileCell',
|
||||
'Cells/EpisodeProgressCell',
|
||||
'Cells/SeriesActionsCell',
|
||||
'Shared/Grid/DateHeaderCell',
|
||||
'Cells/SeriesStatusCell',
|
||||
'Series/Index/FooterView',
|
||||
'Series/Index/FooterModel',
|
||||
'Shared/Toolbar/ToolbarLayout',
|
||||
'underscore'
|
||||
'underscore',
|
||||
'moment'
|
||||
], function (Marionette,
|
||||
Backgrid,
|
||||
PosterCollectionView,
|
||||
|
@ -31,12 +31,12 @@ define(
|
|||
QualityProfileCell,
|
||||
EpisodeProgressCell,
|
||||
SeriesActionsCell,
|
||||
DateHeaderCell,
|
||||
SeriesStatusCell,
|
||||
FooterView,
|
||||
FooterModel,
|
||||
ToolbarLayout,
|
||||
_) {
|
||||
_,
|
||||
Moment) {
|
||||
return Marionette.Layout.extend({
|
||||
template: 'Series/Index/SeriesIndexLayoutTemplate',
|
||||
|
||||
|
@ -78,7 +78,15 @@ define(
|
|||
name : 'nextAiring',
|
||||
label : 'Next Airing',
|
||||
cell : RelativeDateCell,
|
||||
headerCell: DateHeaderCell
|
||||
sortValue : function (model) {
|
||||
var nextAiring = model.get('nextAiring');
|
||||
|
||||
if (!nextAiring) {
|
||||
return Number.MAX_VALUE;
|
||||
}
|
||||
|
||||
return Moment(nextAiring).unix();
|
||||
}
|
||||
},
|
||||
{
|
||||
name : 'percentOfEpisodes',
|
||||
|
|
|
@ -16,7 +16,7 @@ define(
|
|||
|
||||
state: {
|
||||
sortKey: 'title',
|
||||
order : -1
|
||||
order : 'ascending'
|
||||
},
|
||||
|
||||
save: function () {
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
'use strict';
|
||||
|
||||
define(
|
||||
[
|
||||
'backgrid',
|
||||
'Shared/Grid/HeaderCell'
|
||||
], function (Backgrid, NzbDroneHeaderCell) {
|
||||
|
||||
Backgrid.DateHeaderCell = 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 = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
|
||||
return self._comparator(leftVal, rightVal);
|
||||
});
|
||||
}
|
||||
else {
|
||||
this.sort(columnName, 'ascending', function (left, right) {
|
||||
var leftVal = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
|
||||
return self._comparator(rightVal, leftVal);
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
_comparator: function (leftVal, rightVal) {
|
||||
if (!leftVal && !rightVal) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!leftVal) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!rightVal) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (leftVal === rightVal) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (leftVal > rightVal) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
});
|
||||
|
||||
return Backgrid.DateHeaderCell;
|
||||
});
|
|
@ -6,6 +6,7 @@ define(
|
|||
], function (Backgrid) {
|
||||
|
||||
Backgrid.NzbDroneHeaderCell = Backgrid.HeaderCell.extend({
|
||||
|
||||
events: {
|
||||
'click': 'onClick'
|
||||
},
|
||||
|
@ -14,87 +15,113 @@ define(
|
|||
this.$el.empty();
|
||||
this.$el.append(this.column.get('label'));
|
||||
|
||||
if (this.column.get('sortable')) {
|
||||
var column = this.column;
|
||||
var sortable = Backgrid.callByNeed(column.sortable(), column, this.collection);
|
||||
|
||||
if (sortable)
|
||||
{
|
||||
this.$el.addClass('sortable');
|
||||
this.$el.append(' <i class="pull-right"></i>');
|
||||
}
|
||||
|
||||
if (this.collection.state) {
|
||||
var sortKey = this.collection.state.sortKey;
|
||||
var sortDir = this._convertIntToDirection(this.collection.state.order);
|
||||
//Do we need this?
|
||||
this.$el.addClass(column.get('name'));
|
||||
|
||||
if (sortKey === this.column.get('name')) {
|
||||
this.$el.children('i').addClass(this._convertDirectionToIcon(sortDir));
|
||||
this._direction = sortDir;
|
||||
}
|
||||
this.delegateEvents();
|
||||
this.direction(column.get('direction'));
|
||||
|
||||
if (this.collection.state) {
|
||||
var key = this.collection.state.sortKey;
|
||||
var order = this.collection.state.order;
|
||||
|
||||
if (key === this.column.get('name')) {
|
||||
this._setSortIcon(order);
|
||||
}
|
||||
}
|
||||
this.delegateEvents();
|
||||
|
||||
return this;
|
||||
},
|
||||
|
||||
direction: function (dir) {
|
||||
this.$el.children('i').removeClass('icon-sort-up icon-sort-down');
|
||||
|
||||
if (arguments.length) {
|
||||
if (this._direction) {
|
||||
this.$el.children('i').removeClass(this._convertDirectionToIcon(this._direction));
|
||||
if (dir)
|
||||
{
|
||||
this._setSortIcon(dir);
|
||||
}
|
||||
if (dir) {
|
||||
this.$el.children('i').addClass(this._convertDirectionToIcon(dir));
|
||||
}
|
||||
this._direction = dir;
|
||||
|
||||
this.column.set('direction', dir);
|
||||
}
|
||||
|
||||
return this._direction;
|
||||
var columnDirection = this.column.get('direction');
|
||||
|
||||
if (!columnDirection && this.collection.state) {
|
||||
var key = this.collection.state.sortKey;
|
||||
var order = this.collection.state.order;
|
||||
|
||||
if (key === this.column.get('name')) {
|
||||
columnDirection = order;
|
||||
}
|
||||
}
|
||||
|
||||
return columnDirection;
|
||||
},
|
||||
|
||||
onClick: function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
var columnName = this.column.get('name');
|
||||
var collection = this.collection;
|
||||
var event = 'backgrid:sort';
|
||||
|
||||
if (this.column.get('sortable')) {
|
||||
if (this.direction() === 'ascending') {
|
||||
this.sort(columnName, 'descending', function (left, right) {
|
||||
var leftVal = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
if (leftVal === rightVal) {
|
||||
return 0;
|
||||
}
|
||||
else if (leftVal > rightVal) {
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
});
|
||||
function toggleSort(header, col) {
|
||||
collection.state.sortKey = col.get('name');
|
||||
var direction = header.direction();
|
||||
if (direction === 'ascending' || direction === -1)
|
||||
{
|
||||
collection.state.order = 'descending';
|
||||
collection.trigger(event, col, 'descending');
|
||||
}
|
||||
else {
|
||||
this.sort(columnName, 'ascending', function (left, right) {
|
||||
var leftVal = left.get(columnName);
|
||||
var rightVal = right.get(columnName);
|
||||
if (leftVal === rightVal) {
|
||||
return 0;
|
||||
}
|
||||
else if (leftVal < rightVal) {
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
});
|
||||
else
|
||||
{
|
||||
collection.state.order = 'ascending';
|
||||
collection.trigger(event, col, 'ascending');
|
||||
}
|
||||
}
|
||||
|
||||
var column = this.column;
|
||||
var sortable = Backgrid.callByNeed(column.sortable(), column, this.collection);
|
||||
if (sortable) {
|
||||
toggleSort(this, column);
|
||||
}
|
||||
},
|
||||
|
||||
_resetCellDirection: function (columnToSort, direction) {
|
||||
if (columnToSort !== this.column)
|
||||
{
|
||||
this.direction(null);
|
||||
}
|
||||
else
|
||||
{
|
||||
this.direction(direction);
|
||||
}
|
||||
},
|
||||
|
||||
_convertDirectionToIcon: function (dir) {
|
||||
if (dir === 'ascending') {
|
||||
if (dir === 'ascending' || dir === -1) {
|
||||
return 'icon-sort-up';
|
||||
}
|
||||
|
||||
return 'icon-sort-down';
|
||||
},
|
||||
|
||||
_convertIntToDirection: function (dir) {
|
||||
if (dir === '-1') {
|
||||
return 'ascending';
|
||||
}
|
||||
_setSortIcon: function (dir) {
|
||||
this._removeSortIcon();
|
||||
this.$el.children('i').addClass(this._convertDirectionToIcon(dir));
|
||||
},
|
||||
|
||||
return 'descending';
|
||||
_removeSortIcon: function () {
|
||||
this.$el.children('i').removeClass('icon-sort-up icon-sort-down');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -165,7 +165,8 @@ require.config({
|
|||
renderable: true,
|
||||
formatter : undefined,
|
||||
cell : undefined,
|
||||
headerCell: 'NzbDrone'
|
||||
headerCell: 'NzbDrone',
|
||||
sortType : 'toggle'
|
||||
};
|
||||
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue