From 860f55996cb854b23fa9c13f518c7c4a31a4feb1 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Fri, 13 Feb 2015 22:47:42 +0100 Subject: [PATCH] UI Cleanup - Updated Navbar, Profile, Quality and Release subtrees. --- src/UI/Navbar/NavbarLayout.js | 39 +++++++---- src/UI/Navbar/Search.js | 57 ++++++++-------- src/UI/Profile/ProfileCollection.js | 19 +++--- src/UI/Quality/QualityDefinitionModel.js | 5 +- src/UI/Release/AgeCell.js | 14 ++-- src/UI/Release/DownloadReportCell.js | 30 ++++++--- src/UI/Release/PeersCell.js | 18 +++-- src/UI/Release/ProtocolCell.js | 14 ++-- src/UI/Release/ReleaseCollection.js | 83 +++++++++++++---------- src/UI/Release/ReleaseLayout.js | 84 ++++++++++++++---------- 10 files changed, 217 insertions(+), 146 deletions(-) diff --git a/src/UI/Navbar/NavbarLayout.js b/src/UI/Navbar/NavbarLayout.js index 89be60482..85fb37330 100644 --- a/src/UI/Navbar/NavbarLayout.js +++ b/src/UI/Navbar/NavbarLayout.js @@ -5,38 +5,55 @@ var QueueView = require('../Activity/Queue/QueueView'); require('./Search'); module.exports = Marionette.Layout.extend({ - template : 'Navbar/NavbarLayoutTemplate', - regions : { + template : 'Navbar/NavbarLayoutTemplate', + + regions : { health : '#x-health', queue : '#x-queue-count' }, - ui : { + + ui : { search : '.x-series-search', collapse : '.x-navbar-collapse' }, - events : {"click a" : 'onClick'}, - onRender : function(){ + + events : { + 'click a' : 'onClick' + }, + + onRender : function() { this.ui.search.bindSearch(); this.health.show(new HealthView()); this.queue.show(new QueueView()); }, - onClick : function(event){ + + onClick : function(event) { + event.preventDefault(); + var target = $(event.target); + + //look down for var href = event.target.getAttribute('href'); - if(!href && target.closest('a') && target.closest('a')[0]) { + + //if couldn't find it look up' + if (!href && target.closest('a') && target.closest('a')[0]) { + var linkElement = target.closest('a')[0]; + href = linkElement.getAttribute('href'); this.setActive(linkElement); - } - else { + } else { this.setActive(event.target); } - if($(window).width() < 768) { + + if ($(window).width() < 768) { this.ui.collapse.collapse('hide'); } }, - setActive : function(element){ + + setActive : function(element) { + //Todo: Set active on first load this.$('a').removeClass('active'); $(element).addClass('active'); } diff --git a/src/UI/Navbar/Search.js b/src/UI/Navbar/Search.js index 1c1f57bef..ec1e14ead 100644 --- a/src/UI/Navbar/Search.js +++ b/src/UI/Navbar/Search.js @@ -5,32 +5,33 @@ var Backbone = require('backbone'); var SeriesCollection = require('../Series/SeriesCollection'); require('typeahead'); -module.exports = (function(){ - vent.on(vent.Hotkeys.NavbarSearch, function(){ - $('.x-series-search').focus(); +vent.on(vent.Hotkeys.NavbarSearch, function() { + $('.x-series-search').focus(); +}); + +var substringMatcher = function() { + return function findMatches (q, cb) { + var matches = _.select(SeriesCollection.toJSON(), function(series) { + return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1; + }); + cb(matches); + }; +}; + +$.fn.bindSearch = function() { + $(this).typeahead({ + hint : true, + highlight : true, + minLength : 1 + }, { + name : 'series', + displayKey : 'title', + source : substringMatcher() }); - $.fn.bindSearch = function(){ - $(this).typeahead({ - hint : true, - highlight : true, - minLength : 1 - }, { - name : 'series', - displayKey : 'title', - source : substringMatcher() - }); - $(this).on('typeahead:selected typeahead:autocompleted', function(e, series){ - this.blur(); - $(this).val(''); - Backbone.history.navigate('/series/{0}'.format(series.titleSlug), {trigger : true}); - }); - }; - var substringMatcher = function(){ - return function findMatches (q, cb){ - var matches = _.select(SeriesCollection.toJSON(), function(series){ - return series.title.toLowerCase().indexOf(q.toLowerCase()) > -1; - }); - cb(matches); - }; - }; -}).call(this); \ No newline at end of file + + $(this).on('typeahead:selected typeahead:autocompleted', function(e, series) { + this.blur(); + $(this).val(''); + Backbone.history.navigate('/series/{0}'.format(series.titleSlug), { trigger : true }); + }); +}; \ No newline at end of file diff --git a/src/UI/Profile/ProfileCollection.js b/src/UI/Profile/ProfileCollection.js index bf03bd4e9..838ac3c9c 100644 --- a/src/UI/Profile/ProfileCollection.js +++ b/src/UI/Profile/ProfileCollection.js @@ -1,12 +1,13 @@ var Backbone = require('backbone'); var ProfileModel = require('./ProfileModel'); -module.exports = (function(){ - var ProfileCollection = Backbone.Collection.extend({ - model : ProfileModel, - url : window.NzbDrone.ApiRoot + '/profile' - }); - var profiles = new ProfileCollection(); - profiles.fetch(); - return profiles; -}).call(this); \ No newline at end of file +var ProfileCollection = Backbone.Collection.extend({ + model : ProfileModel, + url : window.NzbDrone.ApiRoot + '/profile' +}); + +var profiles = new ProfileCollection(); + +profiles.fetch(); + +module.exports = profiles; diff --git a/src/UI/Quality/QualityDefinitionModel.js b/src/UI/Quality/QualityDefinitionModel.js index 4f905e231..e5a901b6d 100644 --- a/src/UI/Quality/QualityDefinitionModel.js +++ b/src/UI/Quality/QualityDefinitionModel.js @@ -2,10 +2,13 @@ var ModelBase = require('../Settings/SettingsModelBase'); module.exports = ModelBase.extend({ baseInitialize : ModelBase.prototype.initialize, - initialize : function(){ + + initialize : function() { var name = this.get('quality').name; + this.successMessage = 'Saved ' + name + ' quality settings'; this.errorMessage = 'Couldn\'t save ' + name + ' quality settings'; + this.baseInitialize.call(this); } }); \ No newline at end of file diff --git a/src/UI/Release/AgeCell.js b/src/UI/Release/AgeCell.js index 258859bc0..4d6880425 100644 --- a/src/UI/Release/AgeCell.js +++ b/src/UI/Release/AgeCell.js @@ -5,25 +5,31 @@ require('../Shared/FormatHelpers'); module.exports = Backgrid.Cell.extend({ className : 'age-cell', - render : function(){ + + render : function() { var age = this.model.get('age'); var ageHours = this.model.get('ageHours'); var published = moment(this.model.get('publishDate')); var publishedFormatted = published.format('{0} {1}'.format(UiSettings.get('shortDateFormat'), UiSettings.time(true, true))); var formatted = age; var suffix = this.plural(age, 'day'); - if(age === 0) { + + if (age === 0) { formatted = ageHours.toFixed(1); suffix = this.plural(Math.round(ageHours), 'hour'); } + this.$el.html('
{0} {1}
'.format(formatted, suffix, publishedFormatted)); + this.delegateEvents(); return this; }, - plural : function(input, unit){ - if(input === 1) { + + plural : function(input, unit) { + if (input === 1) { return unit; } + return unit + 's'; } }); \ No newline at end of file diff --git a/src/UI/Release/DownloadReportCell.js b/src/UI/Release/DownloadReportCell.js index 7862b8f08..1d5728f6f 100644 --- a/src/UI/Release/DownloadReportCell.js +++ b/src/UI/Release/DownloadReportCell.js @@ -2,30 +2,40 @@ var Backgrid = require('backgrid'); module.exports = Backgrid.Cell.extend({ className : 'download-report-cell', - events : {click : '_onClick'}, - _onClick : function(){ - if(!this.model.get('downloadAllowed')) { + + events : { + 'click' : '_onClick' + }, + + _onClick : function() { + if (!this.model.get('downloadAllowed')) { return; } + var self = this; + this.$el.html('