From d6079a701ca802b5ef8398dc1356c449a24d7e0a Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sat, 14 Feb 2015 11:17:53 +0100 Subject: [PATCH] UI Cleanup - Updated Shared and Shims subtrees. --- src/UI/Shared/ApiData.js | 6 +- .../ControlPanel/ControlPanelController.js | 8 +- .../Shared/ControlPanel/ControlPanelRegion.js | 72 ++++++------ src/UI/Shared/FileBrowser/EmptyView.js | 4 +- .../FileBrowser/FileBrowserCollection.js | 7 +- .../Shared/FileBrowser/FileBrowserLayout.js | 98 ++++++++++------- .../FileBrowser/FileBrowserModalRegion.js | 84 +++++++------- .../Shared/FileBrowser/FileBrowserNameCell.js | 7 +- src/UI/Shared/FileBrowser/FileBrowserRow.js | 19 ++-- .../Shared/FileBrowser/FileBrowserTypeCell.js | 18 +-- src/UI/Shared/FormatHelpers.js | 33 ++++-- src/UI/Shared/Grid/HeaderCell.js | 104 +++++++++++------- src/UI/Shared/Grid/Pager.js | 91 ++++++++++----- src/UI/Shared/Messenger.js | 32 ++++-- src/UI/Shared/Modal/ModalController.js | 40 ++++--- src/UI/Shared/Modal/ModalRegion.js | 79 +++++++------ src/UI/Shared/NotFoundView.js | 4 +- src/UI/Shared/NzbDroneController.js | 32 +++--- src/UI/Shared/SignalRBroadcaster.js | 34 ++++-- .../Toolbar/Button/ButtonCollectionView.js | 15 ++- src/UI/Shared/Toolbar/Button/ButtonView.js | 60 ++++++---- src/UI/Shared/Toolbar/ButtonCollection.js | 4 +- src/UI/Shared/Toolbar/ButtonModel.js | 8 +- .../Radio/RadioButtonCollectionView.js | 29 +++-- .../Shared/Toolbar/Radio/RadioButtonView.js | 39 ++++--- .../Sorting/SortingButtonCollectionView.js | 24 ++-- .../Toolbar/Sorting/SortingButtonView.js | 51 ++++++--- src/UI/Shared/Toolbar/ToolbarLayout.js | 45 +++++--- src/UI/Shared/Tooltip.js | 2 +- src/UI/Shared/UiSettingsModel.js | 46 ++++---- src/UI/Shared/VersionChangeMonitor.js | 6 +- src/UI/Shims/backbone.backgrid.selectall.js | 4 +- src/UI/Shims/backbone.collectionview.js | 4 +- src/UI/Shims/backbone.js | 8 +- src/UI/Shims/backbone.marionette.js | 1 - src/UI/Shims/backbone.validation.js | 1 + src/UI/Shims/jquery.signalR.js | 4 +- src/UI/Shims/messenger.js | 7 +- src/UI/Shims/moment.js | 4 +- 39 files changed, 686 insertions(+), 448 deletions(-) diff --git a/src/UI/Shared/ApiData.js b/src/UI/Shared/ApiData.js index 34dee0e7c..6d8e62043 100644 --- a/src/UI/Shared/ApiData.js +++ b/src/UI/Shared/ApiData.js @@ -1,15 +1,15 @@ var $ = require('jquery'); module.exports = { - get : function(resource){ + get : function(resource) { var url = window.NzbDrone.ApiRoot + '/' + resource; var _data; $.ajax({ url : url, async : false - }).done(function(data){ + }).done(function(data) { _data = data; - }).error(function(xhr, status, error){ + }).error(function(xhr, status, error) { throw error; }); return _data; diff --git a/src/UI/Shared/ControlPanel/ControlPanelController.js b/src/UI/Shared/ControlPanel/ControlPanelController.js index a62a32631..c2a31c3cc 100644 --- a/src/UI/Shared/ControlPanel/ControlPanelController.js +++ b/src/UI/Shared/ControlPanel/ControlPanelController.js @@ -3,14 +3,16 @@ var AppLayout = require('../../AppLayout'); var Marionette = require('marionette'); module.exports = Marionette.AppRouter.extend({ - initialize : function(){ + initialize : function() { vent.on(vent.Commands.OpenControlPanelCommand, this._openControlPanel, this); vent.on(vent.Commands.CloseControlPanelCommand, this._closeControlPanel, this); }, - _openControlPanel : function(view){ + + _openControlPanel : function(view) { AppLayout.controlPanelRegion.show(view); }, - _closeControlPanel : function(){ + + _closeControlPanel : function() { AppLayout.controlPanelRegion.closePanel(); } }); \ No newline at end of file diff --git a/src/UI/Shared/ControlPanel/ControlPanelRegion.js b/src/UI/Shared/ControlPanel/ControlPanelRegion.js index b36b39111..e32c02552 100644 --- a/src/UI/Shared/ControlPanel/ControlPanelRegion.js +++ b/src/UI/Shared/ControlPanel/ControlPanelRegion.js @@ -1,39 +1,41 @@ var $ = require('jquery'); var Backbone = require('backbone'); var Marionette = require('marionette'); +var region = Marionette.Region.extend({ + el : '#control-panel-region', -module.exports = (function(){ - var region = Marionette.Region.extend({ - el : '#control-panel-region', - constructor : function(){ - Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); - this.on('show', this.showPanel, this); - }, - getEl : function(selector){ - var $el = $(selector); - return $el; - }, - showPanel : function(){ - $('body').addClass('control-panel-visible'); - this.$el.animate({ - "margin-bottom" : 0, - "opacity" : 1 - }, { - queue : false, - duration : 300 - }); - }, - closePanel : function(){ - $('body').removeClass('control-panel-visible'); - this.$el.animate({ - "margin-bottom" : -100, - "opacity" : 0 - }, { - queue : false, - duration : 300 - }); - this.reset(); - } - }); - return region; -}).call(this); \ No newline at end of file + constructor : function() { + Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); + this.on('show', this.showPanel, this); + }, + + getEl : function(selector) { + var $el = $(selector); + + return $el; + }, + + showPanel : function() { + $('body').addClass('control-panel-visible'); + this.$el.animate({ + 'margin-bottom' : 0, + 'opacity' : 1 + }, { + queue : false, + duration : 300 + }); + }, + + closePanel : function() { + $('body').removeClass('control-panel-visible'); + this.$el.animate({ + 'margin-bottom' : -100, + 'opacity' : 0 + }, { + queue : false, + duration : 300 + }); + this.reset(); + } +}); +module.exports = region; \ No newline at end of file diff --git a/src/UI/Shared/FileBrowser/EmptyView.js b/src/UI/Shared/FileBrowser/EmptyView.js index 9e03f97af..3bd8ddc93 100644 --- a/src/UI/Shared/FileBrowser/EmptyView.js +++ b/src/UI/Shared/FileBrowser/EmptyView.js @@ -1,3 +1,5 @@ var Marionette = require('marionette'); -module.exports = Marionette.CompositeView.extend({template : 'Shared/FileBrowser/EmptyViewTemplate'}); \ No newline at end of file +module.exports = Marionette.CompositeView.extend({ + template : 'Shared/FileBrowser/EmptyViewTemplate' +}); \ No newline at end of file diff --git a/src/UI/Shared/FileBrowser/FileBrowserCollection.js b/src/UI/Shared/FileBrowser/FileBrowserCollection.js index 8135bba0e..d2771b15d 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserCollection.js +++ b/src/UI/Shared/FileBrowser/FileBrowserCollection.js @@ -5,12 +5,13 @@ var FileBrowserModel = require('./FileBrowserModel'); module.exports = Backbone.Collection.extend({ model : FileBrowserModel, url : window.NzbDrone.ApiRoot + '/filesystem', - parse : function(response){ + + parse : function(response) { var contents = []; - if(response.parent || response.parent === '') { + if (response.parent || response.parent === '') { var type = 'parent'; var name = '...'; - if(response.parent === '') { + if (response.parent === '') { type = 'computer'; name = 'My Computer'; } diff --git a/src/UI/Shared/FileBrowser/FileBrowserLayout.js b/src/UI/Shared/FileBrowser/FileBrowserLayout.js index 1e6b8551e..950c5512b 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserLayout.js +++ b/src/UI/Shared/FileBrowser/FileBrowserLayout.js @@ -1,4 +1,4 @@ -var _ = require('underscore'); +var _ = require('underscore'); var vent = require('vent'); var Marionette = require('marionette'); var Backgrid = require('backgrid'); @@ -13,19 +13,25 @@ var LoadingView = require('../LoadingView'); require('../../Mixins/DirectoryAutoComplete'); module.exports = Marionette.Layout.extend({ - template : "Shared/FileBrowser/FileBrowserLayoutTemplate", - regions : {browser : "#x-browser"}, - ui : { - path : ".x-path", - indicator : ".x-indicator" + template : 'Shared/FileBrowser/FileBrowserLayoutTemplate', + + regions : { + browser : '#x-browser' }, - events : { - "typeahead:selected .x-path" : "_pathChanged", - "typeahead:autocompleted .x-path" : "_pathChanged", - "keyup .x-path" : "_inputChanged", - "click .x-ok" : "_selectPath" + + ui : { + path : '.x-path', + indicator : '.x-indicator' }, - initialize : function(options){ + + events : { + 'typeahead:selected .x-path' : '_pathChanged', + 'typeahead:autocompleted .x-path' : '_pathChanged', + 'keyup .x-path' : '_inputChanged', + 'click .x-ok' : '_selectPath' + }, + + initialize : function(options) { this.collection = new FileBrowserCollection(); this.collection.showFiles = options.showFiles || false; this.collection.showLastModified = options.showLastModified || false; @@ -34,25 +40,30 @@ module.exports = Marionette.Layout.extend({ this.listenTo(this.collection, "sync", this._showGrid); this.listenTo(this.collection, "filebrowser:folderselected", this._rowSelected); }, - onRender : function(){ + + onRender : function() { this.browser.show(new LoadingView()); this.ui.path.directoryAutoComplete(); this._fetchCollection(this.input.val()); this._updatePath(this.input.val()); }, - _setColumns : function(){ - this.columns = [{ - name : "type", - label : "", - sortable : false, - cell : FileBrowserTypeCell - }, { - name : "name", - label : "Name", - sortable : false, - cell : FileBrowserNameCell - }]; - if(this.collection.showLastModified) { + + _setColumns : function() { + this.columns = [ + { + name : "type", + label : "", + sortable : false, + cell : FileBrowserTypeCell + }, + { + name : "name", + label : "Name", + sortable : false, + cell : FileBrowserNameCell + } + ]; + if (this.collection.showLastModified) { this.columns.push({ name : "lastModified", label : "Last Modified", @@ -60,7 +71,7 @@ module.exports = Marionette.Layout.extend({ cell : RelativeDateCell }); } - if(this.collection.showFiles) { + if (this.collection.showFiles) { this.columns.push({ name : "size", label : "Size", @@ -69,17 +80,19 @@ module.exports = Marionette.Layout.extend({ }); } }, - _fetchCollection : function(path){ + + _fetchCollection : function(path) { this.ui.indicator.show(); - var data = {includeFiles : this.collection.showFiles}; - if(path) { + var data = { includeFiles : this.collection.showFiles }; + if (path) { data.path = path; } - this.collection.fetch({data : data}); + this.collection.fetch({ data : data }); }, - _showGrid : function(){ + + _showGrid : function() { this.ui.indicator.hide(); - if(this.collection.models.length === 0) { + if (this.collection.models.length === 0) { this.browser.show(new EmptyView()); return; } @@ -91,27 +104,32 @@ module.exports = Marionette.Layout.extend({ }); this.browser.show(grid); }, - _rowSelected : function(model){ + + _rowSelected : function(model) { var path = model.get("path"); this._updatePath(path); this._fetchCollection(path); }, - _pathChanged : function(e, path){ + + _pathChanged : function(e, path) { this._fetchCollection(path.value); this._updatePath(path.value); }, - _inputChanged : function(){ + + _inputChanged : function() { var path = this.ui.path.val(); - if(path === "" || path.endsWith("\\") || path.endsWith("/")) { + if (path === "" || path.endsWith("\\") || path.endsWith("/")) { this._fetchCollection(path); } }, - _updatePath : function(path){ - if(path !== undefined || path !== null) { + + _updatePath : function(path) { + if (path !== undefined || path !== null) { this.ui.path.val(path); } }, - _selectPath : function(){ + + _selectPath : function() { this.input.val(this.ui.path.val()); this.input.trigger("change"); vent.trigger(vent.Commands.CloseFileBrowser); diff --git a/src/UI/Shared/FileBrowser/FileBrowserModalRegion.js b/src/UI/Shared/FileBrowser/FileBrowserModalRegion.js index 65d177de1..5ca1a446b 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserModalRegion.js +++ b/src/UI/Shared/FileBrowser/FileBrowserModalRegion.js @@ -3,44 +3,48 @@ var Backbone = require('backbone'); var Marionette = require('marionette'); require('bootstrap'); -module.exports = (function(){ - var region = Marionette.Region.extend({ - el : '#file-browser-modal-region', - constructor : function(){ - Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); - this.on('show', this.showModal, this); - }, - getEl : function(selector){ - var $el = $(selector); - $el.on('hidden', this.close); - return $el; - }, - showModal : function(){ - this.$el.addClass('modal fade'); - this.$el.attr('tabindex', '-1'); - this.$el.css('z-index', '1060'); - this.$el.modal({ - show : true, - keyboard : true, - backdrop : true - }); - this.$el.on('hide.bs.modal', $.proxy(this._closing, this)); - this.$el.on('shown.bs.modal', function(){ - $('.modal-backdrop:last').css('z-index', 1059); - }); - this.currentView.$el.addClass('modal-dialog'); - }, - closeModal : function(){ - $(this.el).modal('hide'); - this.reset(); - }, - _closing : function(){ - if(this.$el) { - this.$el.off('hide.bs.modal'); - this.$el.off('shown.bs.modal'); - } - this.reset(); +var region = Marionette.Region.extend({ + el : '#file-browser-modal-region', + + constructor : function() { + Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); + this.on('show', this.showModal, this); + }, + + getEl : function(selector) { + var $el = $(selector); + $el.on('hidden', this.close); + return $el; + }, + + showModal : function() { + this.$el.addClass('modal fade'); + this.$el.attr('tabindex', '-1'); + this.$el.css('z-index', '1060'); + this.$el.modal({ + show : true, + keyboard : true, + backdrop : true + }); + this.$el.on('hide.bs.modal', $.proxy(this._closing, this)); + this.$el.on('shown.bs.modal', function() { + $('.modal-backdrop:last').css('z-index', 1059); + }); + this.currentView.$el.addClass('modal-dialog'); + }, + + closeModal : function() { + $(this.el).modal('hide'); + this.reset(); + }, + + _closing : function() { + if (this.$el) { + this.$el.off('hide.bs.modal'); + this.$el.off('shown.bs.modal'); } - }); - return region; -}).call(this); \ No newline at end of file + this.reset(); + } +}); + +module.exports = region; \ No newline at end of file diff --git a/src/UI/Shared/FileBrowser/FileBrowserNameCell.js b/src/UI/Shared/FileBrowser/FileBrowserNameCell.js index 8da345722..90cb704be 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserNameCell.js +++ b/src/UI/Shared/FileBrowser/FileBrowserNameCell.js @@ -3,11 +3,16 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell'); module.exports = NzbDroneCell.extend({ className : 'file-browser-name-cell', - render : function(){ + + render : function() { this.$el.empty(); + var name = this.model.get(this.column.get('name')); + this.$el.html(name); + this.delegateEvents(); + return this; } }); \ No newline at end of file diff --git a/src/UI/Shared/FileBrowser/FileBrowserRow.js b/src/UI/Shared/FileBrowser/FileBrowserRow.js index d0b5545c1..c891393d9 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserRow.js +++ b/src/UI/Shared/FileBrowser/FileBrowserRow.js @@ -2,17 +2,22 @@ var _ = require('underscore'); var Backgrid = require('backgrid'); module.exports = Backgrid.Row.extend({ - className : 'file-browser-row', - events : {"click" : '_selectRow'}, + className : 'file-browser-row', + + events : { + 'click' : '_selectRow' + }, + _originalInit : Backgrid.Row.prototype.initialize, - initialize : function(){ + + initialize : function() { this._originalInit.apply(this, arguments); }, - _selectRow : function(){ - if(this.model.get('type') === 'file') { + + _selectRow : function() { + if (this.model.get('type') === 'file') { this.model.collection.trigger('filebrowser:fileselected', this.model); - } - else { + } else { this.model.collection.trigger('filebrowser:folderselected', this.model); } } diff --git a/src/UI/Shared/FileBrowser/FileBrowserTypeCell.js b/src/UI/Shared/FileBrowser/FileBrowserTypeCell.js index 69ffdb969..40911d378 100644 --- a/src/UI/Shared/FileBrowser/FileBrowserTypeCell.js +++ b/src/UI/Shared/FileBrowser/FileBrowserTypeCell.js @@ -3,24 +3,26 @@ var NzbDroneCell = require('../../Cells/NzbDroneCell'); module.exports = NzbDroneCell.extend({ className : 'file-browser-type-cell', - render : function(){ + + render : function() { this.$el.empty(); + var type = this.model.get(this.column.get('name')); var icon = 'icon-hdd'; - if(type === 'computer') { + + if (type === 'computer') { icon = 'icon-desktop'; - } - else if(type === 'parent') { + } else if (type === 'parent') { icon = 'icon-level-up'; - } - else if(type === 'folder') { + } else if (type === 'folder') { icon = 'icon-folder-close-alt'; - } - else if(type === 'file') { + } else if (type === 'file') { icon = 'icon-file-alt'; } + this.$el.html(''.format(icon)); this.delegateEvents(); + return this; } }); \ No newline at end of file diff --git a/src/UI/Shared/FormatHelpers.js b/src/UI/Shared/FormatHelpers.js index 40b14d44d..4de9bcb10 100644 --- a/src/UI/Shared/FormatHelpers.js +++ b/src/UI/Shared/FormatHelpers.js @@ -3,43 +3,56 @@ var filesize = require('filesize'); var UiSettings = require('./UiSettingsModel'); module.exports = { - bytes : function(sourceSize){ + bytes : function(sourceSize) { var size = Number(sourceSize); - if(isNaN(size)) { + + if (isNaN(size)) { return ''; } + return filesize(size, { base : 2, round : 1 }); }, - relativeDate : function(sourceDate){ - if(!sourceDate) { + + relativeDate : function(sourceDate) { + if (!sourceDate) { return ''; } + var date = moment(sourceDate); var calendarDate = date.calendar(); + + //TODO: It would be nice to not have to hack this... var strippedCalendarDate = calendarDate.substring(0, calendarDate.indexOf(' at ')); - if(strippedCalendarDate) { + + if (strippedCalendarDate) { return strippedCalendarDate; } - if(date.isAfter(moment())) { + + if (date.isAfter(moment())) { return date.fromNow(true); } - if(date.isBefore(moment().add('years', -1))) { + + if (date.isBefore(moment().add('years', -1))) { return date.format(UiSettings.get('shortDateFormat')); } + return date.fromNow(); }, - pad : function(n, width, z){ + + pad : function(n, width, z) { z = z || '0'; n = n + ''; return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n; }, - number : function(input){ - if(!input) { + + number : function(input) { + if (!input) { return '0'; } + return input.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','); } }; \ No newline at end of file diff --git a/src/UI/Shared/Grid/HeaderCell.js b/src/UI/Shared/Grid/HeaderCell.js index 1e821557b..869b70509 100644 --- a/src/UI/Shared/Grid/HeaderCell.js +++ b/src/UI/Shared/Grid/HeaderCell.js @@ -1,116 +1,144 @@ module.exports = function() { - var backgrid = this; + var Backgrid = this; - backgrid.SonarrHeaderCell = backgrid.HeaderCell.extend({ - events : { + Backgrid.SonarrHeaderCell = Backgrid.HeaderCell.extend({ + events : { 'click' : 'onClick' }, - _originalInit : backgrid.HeaderCell.prototype.initialize, - initialize : function(options){ + + _originalInit : Backgrid.HeaderCell.prototype.initialize, + + initialize : function(options) { this._originalInit.call(this, options); + this.listenTo(this.collection, 'drone:sort', this.render); }, - render : function(){ + + render : function() { this.$el.empty(); this.$el.append(this.column.get('label')); + var column = this.column; - var sortable = backgrid.callByNeed(column.sortable(), column, this.collection); - if(sortable) { + var sortable = Backgrid.callByNeed(column.sortable(), column, this.collection); + + if (sortable) { this.$el.addClass('sortable'); this.$el.append(' '); } + + //Do we need this? this.$el.addClass(column.get('name')); - if(column.has('className')) { + + if (column.has('className')) { this.$el.addClass(column.get('className')); } + this.delegateEvents(); this.direction(column.get('direction')); - if(this.collection.state) { + + if (this.collection.state) { var name = this._getSortMapping().name; var order = this.collection.state.order; - if(name === column.get('name')) { + + if (name === column.get('name')) { this._setSortIcon(order); - } - else { + } else { this._removeSortIcon(); } } + return this; }, - direction : function(dir){ + + direction : function(dir) { this.$el.children('i').removeClass('icon-sort-up icon-sort-down'); - if(arguments.length) { - if(dir) { + + if (arguments.length) { + if (dir) { this._setSortIcon(dir); } + this.column.set('direction', dir); } + var columnDirection = this.column.get('direction'); - if(!columnDirection && this.collection.state) { + + if (!columnDirection && this.collection.state) { var name = this._getSortMapping().name; var order = this.collection.state.order; - if(name === this.column.get('name')) { + + if (name === this.column.get('name')) { columnDirection = order; } } + return columnDirection; }, - _getSortMapping : function(){ + + _getSortMapping : function() { var sortKey = this.collection.state.sortKey; - if(this.collection._getSortMapping) { + + if (this.collection._getSortMapping) { return this.collection._getSortMapping(sortKey); } + return { name : sortKey, sortKey : sortKey }; }, - onClick : function(e){ + + onClick : function(e) { e.preventDefault(); + var collection = this.collection; var event = 'backgrid:sort'; + var column = this.column; - var sortable = backgrid.callByNeed(column.sortable(), column, collection); - if(sortable) { + var sortable = Backgrid.callByNeed(column.sortable(), column, collection); + if (sortable) { var direction = collection.state.order; - if(direction === 'ascending' || direction === -1) { + if (direction === 'ascending' || direction === -1) { direction = 'descending'; - } - else { + } else { direction = 'ascending'; } - if(collection.setSorting) { + + if (collection.setSorting) { collection.setSorting(column.get('name'), direction); - } - else { + } else { collection.state.sortKey = column.get('name'); collection.state.order = direction; } collection.trigger(event, column, direction); } }, - _resetCellDirection : function(columnToSort, direction){ - if(columnToSort !== this.column) { + + _resetCellDirection : function(columnToSort, direction) { + if (columnToSort !== this.column) { this.direction(null); - } - else { + } else { this.direction(direction); } }, - _convertDirectionToIcon : function(dir){ - if(dir === 'ascending' || dir === -1) { + + _convertDirectionToIcon : function(dir) { + if (dir === 'ascending' || dir === -1) { return 'icon-sort-up'; } + return 'icon-sort-down'; }, - _setSortIcon : function(dir){ + + _setSortIcon : function(dir) { this._removeSortIcon(); this.$el.children('i').addClass(this._convertDirectionToIcon(dir)); }, - _removeSortIcon : function(){ + + _removeSortIcon : function() { this.$el.children('i').removeClass('icon-sort-up icon-sort-down'); } }); - return backgrid.SonarrHeaderCell; + return Backgrid.SonarrHeaderCell; }; diff --git a/src/UI/Shared/Grid/Pager.js b/src/UI/Shared/Grid/Pager.js index a3583c0a4..c066843c7 100644 --- a/src/UI/Shared/Grid/Pager.js +++ b/src/UI/Shared/Grid/Pager.js @@ -3,42 +3,52 @@ var Marionette = require('marionette'); var Paginator = require('backgrid.paginator'); module.exports = Paginator.extend({ - template : 'Shared/Grid/PagerTemplate', - events : { - "click .pager-btn" : 'changePage', - "click .x-page-number" : '_showPageJumper', - "change .x-page-select" : '_jumpToPage', - "blur .x-page-select" : 'render' + template : 'Shared/Grid/PagerTemplate', + + events : { + 'click .pager-btn' : 'changePage', + 'click .x-page-number' : '_showPageJumper', + 'change .x-page-select' : '_jumpToPage', + 'blur .x-page-select' : 'render' }, - windowSize : 1, + + windowSize : 1, + fastForwardHandleLabels : { first : 'icon-fast-backward', prev : 'icon-backward', next : 'icon-forward', last : 'icon-fast-forward' }, - changePage : function(e){ + + changePage : function(e) { e.preventDefault(); + var target = this.$(e.target); - if(target.closest('li').hasClass('disabled')) { + + if (target.closest('li').hasClass('disabled')) { return; } + target.closest('li i').addClass('icon-spinner icon-spin'); + var label = target.attr('data-action'); var ffLabels = this.fastForwardHandleLabels; + var collection = this.collection; - if(ffLabels) { + + if (ffLabels) { switch (label) { case 'first': collection.getFirstPage(); return; case 'prev': - if(collection.hasPrevious()) { + if (collection.hasPrevious()) { collection.getPreviousPage(); } return; case 'next': - if(collection.hasNext()) { + if (collection.hasNext()) { collection.getNextPage(); } return; @@ -47,14 +57,19 @@ module.exports = Paginator.extend({ return; } } + var state = collection.state; var pageIndex = target.text(); collection.getPage(state.firstPage === 0 ? pageIndex - 1 : pageIndex); }, - makeHandles : function(){ + + makeHandles : function() { var handles = []; + var collection = this.collection; var state = collection.state; + + // convert all indices to 0-based here var firstPage = state.firstPage; var lastPage = +state.lastPage; lastPage = Math.max(0, firstPage ? lastPage - 1 : lastPage); @@ -62,7 +77,8 @@ module.exports = Paginator.extend({ currentPage = firstPage ? currentPage - 1 : currentPage; var windowStart = Math.floor(currentPage / this.windowSize) * this.windowSize; var windowEnd = Math.min(lastPage + 1, windowStart + this.windowSize); - if(collection.mode !== 'infinite') { + + if (collection.mode !== 'infinite') { for (var i = windowStart; i < windowEnd; i++) { handles.push({ label : i + 1, @@ -73,30 +89,34 @@ module.exports = Paginator.extend({ }); } } + var ffLabels = this.fastForwardHandleLabels; - if(ffLabels) { - if(ffLabels.prev) { + if (ffLabels) { + if (ffLabels.prev) { handles.unshift({ label : ffLabels.prev, className : collection.hasPrevious() ? void 0 : 'disabled', action : 'prev' }); } - if(ffLabels.first) { + + if (ffLabels.first) { handles.unshift({ label : ffLabels.first, className : collection.hasPrevious() ? void 0 : 'disabled', action : 'first' }); } - if(ffLabels.next) { + + if (ffLabels.next) { handles.push({ label : ffLabels.next, className : collection.hasNext() ? void 0 : 'disabled', action : 'next' }); } - if(ffLabels.last) { + + if (ffLabels.last) { handles.push({ label : ffLabels.last, className : collection.hasNext() ? void 0 : 'disabled', @@ -104,44 +124,59 @@ module.exports = Paginator.extend({ }); } } + return handles; }, - render : function(){ + + render : function() { this.$el.empty(); + var templateFunction = Marionette.TemplateCache.get(this.template); + this.$el.html(templateFunction({ handles : this.makeHandles(), state : this.collection.state })); + this.delegateEvents(); + return this; }, - _showPageJumper : function(e){ - if($(e.target).is('select')) { + + _showPageJumper : function(e) { + if ($(e.target).is('select')) { return; } + var templateFunction = Marionette.TemplateCache.get('Shared/Grid/JumpToPageTemplate'); var state = this.collection.state; var currentPage = Math.max(state.currentPage, state.firstPage); currentPage = state.firstPage ? currentPage - 1 : currentPage; + var pages = []; + for (var i = 0; i < this.collection.state.lastPage; i++) { - if(i === currentPage) { + if (i === currentPage) { pages.push({ page : i + 1, current : true }); - } - else { - pages.push({page : i + 1}); + } else { + pages.push({ page : i + 1 }); } } - this.$el.find('.x-page-number').html(templateFunction({pages : pages})); + + this.$el.find('.x-page-number').html(templateFunction({ pages : pages })); }, - _jumpToPage : function(){ + + _jumpToPage : function() { var target = this.$el.find('.x-page-select'); + + //Remove event handlers so the blur event is not triggered this.undelegateEvents(); + var selectedPage = parseInt(target.val(), 10); + this.$el.find('.x-page-number').html(''); this.collection.getPage(selectedPage); } diff --git a/src/UI/Shared/Messenger.js b/src/UI/Shared/Messenger.js index 31befd312..11837396a 100644 --- a/src/UI/Shared/Messenger.js +++ b/src/UI/Shared/Messenger.js @@ -2,23 +2,28 @@ require('messenger'); var messenger = require('messenger'); module.exports = { - show : function(options){ - if(!options.type) { + show : function(options) { + if (!options.type) { options.type = 'info'; } - if(options.hideAfter === undefined) { + + if (options.hideAfter === undefined) { switch (options.type) { case 'info': options.hideAfter = 5; break; + case 'success': options.hideAfter = 5; break; + default: options.hideAfter = 5; } } + options.hideOnNavigate = options.hideOnNavigate || false; + return messenger().post({ message : options.message, type : options.type, @@ -29,26 +34,33 @@ module.exports = { hideOnNavigate : options.hideOnNavigate }); }, - monitor : function(options){ - if(!options.promise) { + + monitor : function(options) { + if (!options.promise) { throw 'promise is required'; } - if(!options.successMessage) { + + if (!options.successMessage) { throw 'success message is required'; } - if(!options.errorMessage) { + + if (!options.errorMessage) { throw 'error message is required'; } + var self = this; - options.promise.done(function(){ - self.show({message : options.successMessage}); + + options.promise.done(function() { + self.show({ message : options.successMessage }); }); - options.promise.fail(function(){ + + options.promise.fail(function() { self.show({ message : options.errorMessage, type : 'error' }); }); + return options.promise; } }; \ No newline at end of file diff --git a/src/UI/Shared/Modal/ModalController.js b/src/UI/Shared/Modal/ModalController.js index 76957f00f..624c255b2 100644 --- a/src/UI/Shared/Modal/ModalController.js +++ b/src/UI/Shared/Modal/ModalController.js @@ -10,7 +10,7 @@ var RenamePreviewLayout = require('../../Rename/RenamePreviewLayout'); var FileBrowserLayout = require('../FileBrowser/FileBrowserLayout'); module.exports = Marionette.AppRouter.extend({ - initialize : function(){ + initialize : function() { vent.on(vent.Commands.OpenModalCommand, this._openModal, this); vent.on(vent.Commands.CloseModalCommand, this._closeModal, this); vent.on(vent.Commands.EditSeriesCommand, this._editSeries, this); @@ -22,21 +22,26 @@ module.exports = Marionette.AppRouter.extend({ vent.on(vent.Commands.ShowFileBrowser, this._showFileBrowser, this); vent.on(vent.Commands.CloseFileBrowser, this._closeFileBrowser, this); }, - _openModal : function(view){ + + _openModal : function(view) { AppLayout.modalRegion.show(view); }, - _closeModal : function(){ + + _closeModal : function() { AppLayout.modalRegion.closeModal(); }, - _editSeries : function(options){ - var view = new EditSeriesView({model : options.series}); + + _editSeries : function(options) { + var view = new EditSeriesView({ model : options.series }); AppLayout.modalRegion.show(view); }, - _deleteSeries : function(options){ - var view = new DeleteSeriesView({model : options.series}); + + _deleteSeries : function(options) { + var view = new DeleteSeriesView({ model : options.series }); AppLayout.modalRegion.show(view); }, - _showEpisode : function(options){ + + _showEpisode : function(options) { var view = new EpisodeDetailsLayout({ model : options.episode, hideSeriesLink : options.hideSeriesLink, @@ -44,23 +49,28 @@ module.exports = Marionette.AppRouter.extend({ }); AppLayout.modalRegion.show(view); }, - _showHistory : function(options){ - var view = new HistoryDetailsLayout({model : options.model}); + + _showHistory : function(options) { + var view = new HistoryDetailsLayout({ model : options.model }); AppLayout.modalRegion.show(view); }, - _showLogDetails : function(options){ - var view = new LogDetailsView({model : options.model}); + + _showLogDetails : function(options) { + var view = new LogDetailsView({ model : options.model }); AppLayout.modalRegion.show(view); }, - _showRenamePreview : function(options){ + + _showRenamePreview : function(options) { var view = new RenamePreviewLayout(options); AppLayout.modalRegion.show(view); }, - _showFileBrowser : function(options){ + + _showFileBrowser : function(options) { var view = new FileBrowserLayout(options); AppLayout.fileBrowserModalRegion.show(view); }, - _closeFileBrowser : function(){ + + _closeFileBrowser : function(options) { AppLayout.fileBrowserModalRegion.closeModal(); } }); \ No newline at end of file diff --git a/src/UI/Shared/Modal/ModalRegion.js b/src/UI/Shared/Modal/ModalRegion.js index cc940e5e2..857af257d 100644 --- a/src/UI/Shared/Modal/ModalRegion.js +++ b/src/UI/Shared/Modal/ModalRegion.js @@ -2,40 +2,49 @@ var $ = require('jquery'); var Backbone = require('backbone'); var Marionette = require('marionette'); require('bootstrap'); +var region = Marionette.Region.extend({ + el : '#modal-region', -module.exports = (function(){ - var region = Marionette.Region.extend({ - el : '#modal-region', - constructor : function(){ - Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); - this.on('show', this.showModal, this); - }, - getEl : function(selector){ - var $el = $(selector); - $el.on('hidden', this.close); - return $el; - }, - showModal : function(){ - this.$el.addClass('modal fade'); - this.$el.attr('tabindex', '-1'); - this.$el.modal({ - show : true, - keyboard : true, - backdrop : true - }); - this.$el.on('hide.bs.modal', $.proxy(this._closing, this)); - this.currentView.$el.addClass('modal-dialog'); - }, - closeModal : function(){ - $(this.el).modal('hide'); - this.reset(); - }, - _closing : function(){ - if(this.$el) { - this.$el.off('hide.bs.modal'); - } - this.reset(); + constructor : function() { + Backbone.Marionette.Region.prototype.constructor.apply(this, arguments); + this.on('show', this.showModal, this); + }, + + getEl : function(selector) { + var $el = $(selector); + $el.on('hidden', this.close); + return $el; + }, + + showModal : function() { + this.$el.addClass('modal fade'); + + //need tab index so close on escape works + //https://github.com/twitter/bootstrap/issues/4663 + this.$el.attr('tabindex', '-1'); + this.$el.modal({ + show : true, + keyboard : true, + backdrop : true + }); + + this.$el.on('hide.bs.modal', $.proxy(this._closing, this)); + + this.currentView.$el.addClass('modal-dialog'); + }, + + closeModal : function() { + $(this.el).modal('hide'); + this.reset(); + }, + + _closing : function() { + if (this.$el) { + this.$el.off('hide.bs.modal'); } - }); - return region; -}).call(this); \ No newline at end of file + + this.reset(); + } +}); + +module.exports = region; \ No newline at end of file diff --git a/src/UI/Shared/NotFoundView.js b/src/UI/Shared/NotFoundView.js index 087355c8d..f0b34039a 100644 --- a/src/UI/Shared/NotFoundView.js +++ b/src/UI/Shared/NotFoundView.js @@ -1,3 +1,5 @@ var Marionette = require('marionette'); -module.exports = Marionette.ItemView.extend({template : 'Shared/NotFoundViewTemplate'}); \ No newline at end of file +module.exports = Marionette.ItemView.extend({ + template : 'Shared/NotFoundViewTemplate' +}); \ No newline at end of file diff --git a/src/UI/Shared/NzbDroneController.js b/src/UI/Shared/NzbDroneController.js index 4e5739b2b..dffc7f51e 100644 --- a/src/UI/Shared/NzbDroneController.js +++ b/src/UI/Shared/NzbDroneController.js @@ -1,27 +1,28 @@ -var vent = require('vent'); +var vent = require('vent'); var AppLayout = require('../AppLayout'); var Marionette = require('marionette'); var NotFoundView = require('./NotFoundView'); var Messenger = require('messenger'); - module.exports = Marionette.AppRouter.extend({ - initialize : function(){ + initialize : function() { this.listenTo(vent, vent.Events.ServerUpdated, this._onServerUpdated); }, - showNotFound : function(){ + + showNotFound : function() { this.setTitle('Not Found'); this.showMainRegion(new NotFoundView(this)); }, - setTitle : function(title){ + + setTitle : function(title) { title = title; - if(title === 'Sonarr') { + if (title === 'Sonarr') { document.title = 'Sonarr'; - } - else { + } else { document.title = title + ' - Sonarr'; } - if(window.NzbDrone.Analytics && window.Piwik) { + + if (window.NzbDrone.Analytics && window.Piwik) { try { var piwik = window.Piwik.getTracker('http://piwik.nzbdrone.com/piwik.php', 1); piwik.setReferrerUrl(''); @@ -35,7 +36,8 @@ module.exports = Marionette.AppRouter.extend({ } } }, - _onServerUpdated : function(){ + + _onServerUpdated : function() { Messenger.show({ message : 'Sonarr has been updated', hideAfter : 0, @@ -43,7 +45,7 @@ module.exports = Marionette.AppRouter.extend({ actions : { viewChanges : { label : 'View Changes', - action : function(){ + action : function() { window.location = window.NzbDrone.UrlBase + '/system/updates'; } } @@ -52,11 +54,11 @@ module.exports = Marionette.AppRouter.extend({ this.pendingUpdate = true; }, - showMainRegion : function(view){ - if(this.pendingUpdate) { + + showMainRegion : function(view) { + if (this.pendingUpdate) { window.location.reload(); - } - else { + } else { AppLayout.mainRegion.show(view); } } diff --git a/src/UI/Shared/SignalRBroadcaster.js b/src/UI/Shared/SignalRBroadcaster.js index d2dfc95ab..2d5292760 100644 --- a/src/UI/Shared/SignalRBroadcaster.js +++ b/src/UI/Shared/SignalRBroadcaster.js @@ -5,9 +5,10 @@ var StatusModel = require('../System/StatusModel'); require('signalR'); module.exports = { - appInitializer : function(){ + appInitializer : function() { console.log('starting signalR'); - var getStatus = function(status){ + + var getStatus = function(status) { switch (status) { case 0: return 'connecting'; @@ -21,27 +22,36 @@ module.exports = { throw 'invalid status ' + status; } }; + var tryingToReconnect = false; var messengerId = 'signalR'; + this.signalRconnection = $.connection(StatusModel.get('urlBase') + '/signalr'); - this.signalRconnection.stateChanged(function(change){ + + this.signalRconnection.stateChanged(function(change) { console.debug('SignalR: [{0}]'.format(getStatus(change.newState))); }); - this.signalRconnection.received(function(message){ + + this.signalRconnection.received(function(message) { vent.trigger('server:' + message.name, message.body); }); - this.signalRconnection.reconnecting(function(){ - if(window.NzbDrone.unloading) { + + this.signalRconnection.reconnecting(function() { + if (window.NzbDrone.unloading) { return; } + tryingToReconnect = true; }); - this.signalRconnection.reconnected(function(){ + + this.signalRconnection.reconnected(function() { tryingToReconnect = false; }); - this.signalRconnection.disconnected(function(){ - if(tryingToReconnect) { + + this.signalRconnection.disconnected(function() { + if (tryingToReconnect) { $('
').appendTo(document.body); + Messenger.show({ id : messengerId, type : 'error', @@ -50,7 +60,7 @@ module.exports = { actions : { cancel : { label : 'Reload', - action : function(){ + action : function() { window.location.reload(); } } @@ -58,7 +68,9 @@ module.exports = { }); } }); - this.signalRconnection.start({transport : ['longPolling']}); + + this.signalRconnection.start({ transport : ['longPolling'] }); + return this; } }; \ No newline at end of file diff --git a/src/UI/Shared/Toolbar/Button/ButtonCollectionView.js b/src/UI/Shared/Toolbar/Button/ButtonCollectionView.js index 98f48c5c8..097df89ab 100644 --- a/src/UI/Shared/Toolbar/Button/ButtonCollectionView.js +++ b/src/UI/Shared/Toolbar/Button/ButtonCollectionView.js @@ -2,17 +2,20 @@ var Marionette = require('marionette'); var ButtonView = require('./ButtonView'); module.exports = Marionette.CollectionView.extend({ - className : 'btn-group', - itemView : ButtonView, - initialize : function(options){ + className : 'btn-group', + itemView : ButtonView, + + initialize : function(options) { this.menu = options.menu; this.className = 'btn-group'; - if(options.menu.collapse) { + + if (options.menu.collapse) { this.className += ' btn-group-collapse'; } }, - onRender : function(){ - if(this.menu.collapse) { + + onRender : function() { + if (this.menu.collapse) { this.$el.addClass('btn-group-collapse'); } } diff --git a/src/UI/Shared/Toolbar/Button/ButtonView.js b/src/UI/Shared/Toolbar/Button/ButtonView.js index 901245d7c..14cbb3818 100644 --- a/src/UI/Shared/Toolbar/Button/ButtonView.js +++ b/src/UI/Shared/Toolbar/Button/ButtonView.js @@ -4,59 +4,77 @@ var _ = require('underscore'); var CommandController = require('../../../Commands/CommandController'); module.exports = Marionette.ItemView.extend({ - template : 'Shared/Toolbar/ButtonTemplate', - className : 'btn btn-default btn-icon-only-xs', - ui : {icon : 'i'}, - events : {"click" : 'onClick'}, - initialize : function(){ + template : 'Shared/Toolbar/ButtonTemplate', + className : 'btn btn-default btn-icon-only-xs', + + ui : { + icon : 'i' + }, + + events : { + 'click' : 'onClick' + }, + + initialize : function() { this.storageKey = this.model.get('menuKey') + ':' + this.model.get('key'); }, - onRender : function(){ - if(this.model.get('active')) { + + onRender : function() { + if (this.model.get('active')) { this.$el.addClass('active'); this.invokeCallback(); } - if(!this.model.get('title')) { + + if (!this.model.get('title')) { this.$el.addClass('btn-icon-only'); } - if(this.model.get('className')) { + + if (this.model.get('className')) { this.$el.addClass(this.model.get('className')); } + var command = this.model.get('command'); - if(command) { - var properties = _.extend({name : command}, this.model.get('properties')); + if (command) { + var properties = _.extend({ name : command }, this.model.get('properties')); + CommandController.bindToCommand({ command : properties, element : this.$el }); } }, - onClick : function(){ - if(this.$el.hasClass('disabled')) { + + onClick : function() { + if (this.$el.hasClass('disabled')) { return; } + this.invokeCallback(); this.invokeRoute(); this.invokeCommand(); }, - invokeCommand : function(){ + + invokeCommand : function() { var command = this.model.get('command'); - if(command) { + if (command) { CommandController.Execute(command, this.model.get('properties')); } }, - invokeRoute : function(){ + + invokeRoute : function() { var route = this.model.get('route'); - if(route) { - Backbone.history.navigate(route, {trigger : true}); + if (route) { + Backbone.history.navigate(route, { trigger : true }); } }, - invokeCallback : function(){ - if(!this.model.ownerContext) { + + invokeCallback : function() { + if (!this.model.ownerContext) { throw 'ownerContext must be set.'; } + var callback = this.model.get('callback'); - if(callback) { + if (callback) { callback.call(this.model.ownerContext, this); } } diff --git a/src/UI/Shared/Toolbar/ButtonCollection.js b/src/UI/Shared/Toolbar/ButtonCollection.js index cda70db0a..a48a04574 100644 --- a/src/UI/Shared/Toolbar/ButtonCollection.js +++ b/src/UI/Shared/Toolbar/ButtonCollection.js @@ -1,4 +1,6 @@ var Backbone = require('backbone'); var ButtonModel = require('./ButtonModel'); -module.exports = Backbone.Collection.extend({model : ButtonModel}); \ No newline at end of file +module.exports = Backbone.Collection.extend({ + model : ButtonModel +}); \ No newline at end of file diff --git a/src/UI/Shared/Toolbar/ButtonModel.js b/src/UI/Shared/Toolbar/ButtonModel.js index 44d85a93a..055a4ef8f 100644 --- a/src/UI/Shared/Toolbar/ButtonModel.js +++ b/src/UI/Shared/Toolbar/ButtonModel.js @@ -3,9 +3,9 @@ var Backbone = require('backbone'); module.exports = Backbone.Model.extend({ defaults : { - "target" : '/nzbdrone/route', - "title" : '', - "active" : false, - "tooltip" : undefined + 'target' : '/nzbdrone/route', + 'title' : '', + 'active' : false, + 'tooltip' : undefined } }); \ No newline at end of file diff --git a/src/UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js b/src/UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js index 1680fca19..70c4fb188 100644 --- a/src/UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js +++ b/src/UI/Shared/Toolbar/Radio/RadioButtonCollectionView.js @@ -3,26 +3,33 @@ var RadioButtonView = require('./RadioButtonView'); var Config = require('../../../Config'); module.exports = Marionette.CollectionView.extend({ - className : 'btn-group', - itemView : RadioButtonView, - attributes : {"data-toggle" : 'buttons'}, - initialize : function(options){ + className : 'btn-group', + itemView : RadioButtonView, + + attributes : { + 'data-toggle' : 'buttons' + }, + + initialize : function(options) { this.menu = options.menu; + this.setActive(); }, - setActive : function(){ + + setActive : function() { var storedKey = this.menu.defaultAction; - if(this.menu.storeState) { + + if (this.menu.storeState) { storedKey = Config.getValue(this.menu.menuKey, storedKey); } - if(!storedKey) { + + if (!storedKey) { return; } - this.collection.each(function(model){ - if(model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) { + this.collection.each(function(model) { + if (model.get('key').toLocaleLowerCase() === storedKey.toLowerCase()) { model.set('active', true); - } - else { + } else { model.set('active, false'); } }); diff --git a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js index b4b6cb2f3..90fa0bd0c 100644 --- a/src/UI/Shared/Toolbar/Radio/RadioButtonView.js +++ b/src/UI/Shared/Toolbar/Radio/RadioButtonView.js @@ -2,35 +2,48 @@ var Marionette = require('marionette'); var Config = require('../../../Config'); module.exports = Marionette.ItemView.extend({ - template : 'Shared/Toolbar/RadioButtonTemplate', - className : 'btn btn-default', - ui : {icon : 'i'}, - events : {"click" : 'onClick'}, - initialize : function(){ + template : 'Shared/Toolbar/RadioButtonTemplate', + className : 'btn btn-default', + + ui : { + icon : 'i' + }, + + events : { + 'click' : 'onClick' + }, + + initialize : function() { this.storageKey = this.model.get('menuKey') + ':' + this.model.get('key'); }, - onRender : function(){ - if(this.model.get('active')) { + + onRender : function() { + if (this.model.get('active')) { this.$el.addClass('active'); this.invokeCallback(); } - if(!this.model.get('title')) { + + if (!this.model.get('title')) { this.$el.addClass('btn-icon-only'); } - if(this.model.get('tooltip')) { + + if (this.model.get('tooltip')) { this.$el.attr('title', this.model.get('tooltip')); } }, - onClick : function(){ + + onClick : function() { Config.setValue(this.model.get('menuKey'), this.model.get('key')); this.invokeCallback(); }, - invokeCallback : function(){ - if(!this.model.ownerContext) { + + invokeCallback : function() { + if (!this.model.ownerContext) { throw 'ownerContext must be set.'; } + var callback = this.model.get('callback'); - if(callback) { + if (callback) { callback.call(this.model.ownerContext, this); } } diff --git a/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionView.js b/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionView.js index 9c33477e8..6db8995a2 100644 --- a/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionView.js +++ b/src/UI/Shared/Toolbar/Sorting/SortingButtonCollectionView.js @@ -6,27 +6,33 @@ module.exports = Marionette.CompositeView.extend({ itemView : ButtonView, template : 'Shared/Toolbar/Sorting/SortingButtonCollectionViewTemplate', itemViewContainer : '.dropdown-menu', - initialize : function(options){ + + initialize : function(options) { this.viewCollection = options.viewCollection; this.listenTo(this.viewCollection, 'drone:sort', this.sort); }, - itemViewOptions : function(){ - return {viewCollection : this.viewCollection}; + + itemViewOptions : function() { + return { + viewCollection : this.viewCollection + }; }, - sort : function(sortModel, sortDirection){ + + sort : function(sortModel, sortDirection) { var collection = this.viewCollection; + var order; - if(sortDirection === 'ascending') { + if (sortDirection === 'ascending') { order = -1; - } - else if(sortDirection === 'descending') { + } else if (sortDirection === 'descending') { order = 1; - } - else { + } else { order = null; } + collection.setSorting(sortModel.get('name'), order); collection.fullCollection.sort(); + return this; } }); \ No newline at end of file diff --git a/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js b/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js index ef56bb2a6..82fabf881 100644 --- a/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js +++ b/src/UI/Shared/Toolbar/Sorting/SortingButtonView.js @@ -3,53 +3,68 @@ var Marionette = require('marionette'); var _ = require('underscore'); module.exports = Marionette.ItemView.extend({ - template : 'Shared/Toolbar/Sorting/SortingButtonViewTemplate', - tagName : 'li', - ui : {icon : 'i'}, - events : {"click" : 'onClick'}, - initialize : function(options){ + template : 'Shared/Toolbar/Sorting/SortingButtonViewTemplate', + tagName : 'li', + + ui : { + icon : 'i' + }, + + events : { + 'click' : 'onClick' + }, + + initialize : function(options) { this.viewCollection = options.viewCollection; this.listenTo(this.viewCollection, 'drone:sort', this.render); this.listenTo(this.viewCollection, 'backgrid:sort', this.render); }, - onRender : function(){ - if(this.viewCollection.state) { + + onRender : function() { + if (this.viewCollection.state) { var sortKey = this.viewCollection.state.sortKey; var name = this.viewCollection._getSortMapping(sortKey).name; var order = this.viewCollection.state.order; - if(name === this.model.get('name')) { + + if (name === this.model.get('name')) { this._setSortIcon(order); - } - else { + } else { this._removeSortIcon(); } } }, - onClick : function(e){ + + onClick : function(e) { e.preventDefault(); + var collection = this.viewCollection; var event = 'drone:sort'; + var direction = collection.state.order; - if(direction === 'ascending' || direction === -1) { + if (direction === 'ascending' || direction === -1) { direction = 'descending'; - } - else { + } else { direction = 'ascending'; } + collection.setSorting(this.model.get('name'), direction); collection.trigger(event, this.model, direction); }, - _convertDirectionToIcon : function(dir){ - if(dir === 'ascending' || dir === -1) { + + _convertDirectionToIcon : function(dir) { + if (dir === 'ascending' || dir === -1) { return 'icon-sort-up'; } + return 'icon-sort-down'; }, - _setSortIcon : function(dir){ + + _setSortIcon : function(dir) { this._removeSortIcon(); this.ui.icon.addClass(this._convertDirectionToIcon(dir)); }, - _removeSortIcon : function(){ + + _removeSortIcon : function() { this.ui.icon.removeClass('icon-sort-up icon-sort-down'); } }); \ No newline at end of file diff --git a/src/UI/Shared/Toolbar/ToolbarLayout.js b/src/UI/Shared/Toolbar/ToolbarLayout.js index 450e6061b..4010dafc9 100644 --- a/src/UI/Shared/Toolbar/ToolbarLayout.js +++ b/src/UI/Shared/Toolbar/ToolbarLayout.js @@ -7,49 +7,61 @@ var SortingButtonCollectionView = require('./Sorting/SortingButtonCollectionView var _ = require('underscore'); module.exports = Marionette.Layout.extend({ - template : 'Shared/Toolbar/ToolbarLayoutTemplate', - className : 'toolbar', - ui : { + template : 'Shared/Toolbar/ToolbarLayoutTemplate', + className : 'toolbar', + + ui : { left_x : '.x-toolbar-left', right_x : '.x-toolbar-right' }, - initialize : function(options){ - if(!options) { + + initialize : function(options) { + if (!options) { throw 'options needs to be passed'; } - if(!options.context) { + + if (!options.context) { throw 'context needs to be passed'; } + this.left = options.left; this.right = options.right; this.toolbarContext = options.context; }, - onShow : function(){ - if(this.left) { + + onShow : function() { + if (this.left) { _.each(this.left, this._showToolbarLeft, this); } - if(this.right) { + if (this.right) { _.each(this.right, this._showToolbarRight, this); } }, - _showToolbarLeft : function(element, index){ + + _showToolbarLeft : function(element, index) { this._showToolbar(element, index, 'left'); }, - _showToolbarRight : function(element, index){ + + _showToolbarRight : function(element, index) { this._showToolbar(element, index, 'right'); }, - _showToolbar : function(buttonGroup, index, position){ + + _showToolbar : function(buttonGroup, index, position) { var groupCollection = new ButtonCollection(); - _.each(buttonGroup.items, function(button){ - if(buttonGroup.storeState && !button.key) { + + _.each(buttonGroup.items, function(button) { + if (buttonGroup.storeState && !button.key) { throw 'must provide key for all buttons when storSstate is enabled'; } + var model = new ButtonModel(button); model.set('menuKey', buttonGroup.menuKey); model.ownerContext = this.toolbarContext; groupCollection.add(model); }, this); + var buttonGroupView; + switch (buttonGroup.type) { case 'radio': { @@ -77,13 +89,16 @@ module.exports = Marionette.Layout.extend({ break; } } + var regionId = position + '_' + (index + 1); var region = this[regionId]; - if(!region) { + + if (!region) { var regionClassName = 'x-toolbar-' + position + '-' + (index + 1); this.ui[position + '_x'].append('
\r\n'); region = this.addRegion(regionId, '.' + regionClassName); } + region.show(buttonGroupView); } }); \ No newline at end of file diff --git a/src/UI/Shared/Tooltip.js b/src/UI/Shared/Tooltip.js index a2dc0c916..db71cdc7c 100644 --- a/src/UI/Shared/Tooltip.js +++ b/src/UI/Shared/Tooltip.js @@ -22,7 +22,7 @@ Tooltip.prototype.getOptions = function(options) { module.exports = { appInitializer : function() { - $('body').tooltip({selector : '[title]'}); + $('body').tooltip({ selector : '[title]' }); return this; } diff --git a/src/UI/Shared/UiSettingsModel.js b/src/UI/Shared/UiSettingsModel.js index a05ce7eed..a517b5aba 100644 --- a/src/UI/Shared/UiSettingsModel.js +++ b/src/UI/Shared/UiSettingsModel.js @@ -1,25 +1,29 @@ var Backbone = require('backbone'); var ApiData = require('./ApiData'); -module.exports = (function(){ - var UiSettings = Backbone.Model.extend({ - url : window.NzbDrone.ApiRoot + '/config/ui', - shortDateTime : function(includeSeconds){ - return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds); - }, - longDateTime : function(includeSeconds){ - return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds); - }, - time : function(includeMinuteZero, includeSeconds){ - if(includeSeconds) { - return this.get('timeFormat').replace(/\(?\:mm\)?/, ':mm:ss'); - } - if(includeMinuteZero) { - return this.get('timeFormat').replace('(', '').replace(')', ''); - } - return this.get('timeFormat').replace(/\(\:mm\)/, ''); +var UiSettings = Backbone.Model.extend({ + url : window.NzbDrone.ApiRoot + '/config/ui', + + shortDateTime : function(includeSeconds) { + return this.get('shortDateFormat') + ' ' + this.time(true, includeSeconds); + }, + + longDateTime : function(includeSeconds) { + return this.get('longDateFormat') + ' ' + this.time(true, includeSeconds); + }, + + time : function(includeMinuteZero, includeSeconds) { + if (includeSeconds) { + return this.get('timeFormat').replace(/\(?\:mm\)?/, ':mm:ss'); } - }); - var instance = new UiSettings(ApiData.get('config/ui')); - return instance; -}).call(this); \ No newline at end of file + if (includeMinuteZero) { + return this.get('timeFormat').replace('(', '').replace(')', ''); + } + + return this.get('timeFormat').replace(/\(\:mm\)/, ''); + } +}); + +var instance = new UiSettings(ApiData.get('config/ui')); + +module.exports = instance; \ No newline at end of file diff --git a/src/UI/Shared/VersionChangeMonitor.js b/src/UI/Shared/VersionChangeMonitor.js index cf915b10d..a2bf14d23 100644 --- a/src/UI/Shared/VersionChangeMonitor.js +++ b/src/UI/Shared/VersionChangeMonitor.js @@ -1,13 +1,13 @@ var $ = require('jquery'); var vent = require('vent'); -$(document).ajaxSuccess(function(event, xhr){ +$(document).ajaxSuccess(function(event, xhr) { var version = xhr.getResponseHeader('X-ApplicationVersion'); - if(!version || !window.NzbDrone || !window.NzbDrone.Version) { + if (!version || !window.NzbDrone || !window.NzbDrone.Version) { return; } - if(version !== window.NzbDrone.Version) { + if (version !== window.NzbDrone.Version) { vent.trigger(vent.Events.ServerUpdated); } }); \ No newline at end of file diff --git a/src/UI/Shims/backbone.backgrid.selectall.js b/src/UI/Shims/backbone.backgrid.selectall.js index 45ae2ce9d..10b92f5d9 100644 --- a/src/UI/Shims/backbone.backgrid.selectall.js +++ b/src/UI/Shims/backbone.backgrid.selectall.js @@ -1,6 +1,4 @@ -require('backgrid'); -require('../JsLibraries/backbone.backgrid.selectall'); - var backgrid = require('backgrid'); require('../JsLibraries/backbone.backgrid.selectall'); + module.exports = backgrid.Extension.SelectRowCell; \ No newline at end of file diff --git a/src/UI/Shims/backbone.collectionview.js b/src/UI/Shims/backbone.collectionview.js index 047528bf0..0e2370b93 100644 --- a/src/UI/Shims/backbone.collectionview.js +++ b/src/UI/Shims/backbone.collectionview.js @@ -1,6 +1,4 @@ -require('backbone'); -require('../JsLibraries/backbone.collectionview'); - window.Backbone = require('backbone'); require('../JsLibraries/backbone.collectionview'); + module.exports = window.Backbone.CollectionView; \ No newline at end of file diff --git a/src/UI/Shims/backbone.js b/src/UI/Shims/backbone.js index c1a1fc060..0896076d8 100644 --- a/src/UI/Shims/backbone.js +++ b/src/UI/Shims/backbone.js @@ -1,7 +1,7 @@ var jquery = require('jquery'); +var Backbone = require('../JsLibraries/backbone'); -var backbone = require('../JsLibraries/backbone'); -window.Backbone = backbone; -backbone.$ = jquery; +window.Backbone = Backbone; +Backbone.$ = jquery; -module.exports = backbone; \ No newline at end of file +module.exports = Backbone; \ No newline at end of file diff --git a/src/UI/Shims/backbone.marionette.js b/src/UI/Shims/backbone.marionette.js index fc4579a11..50b3bf182 100644 --- a/src/UI/Shims/backbone.marionette.js +++ b/src/UI/Shims/backbone.marionette.js @@ -7,5 +7,4 @@ var asNamedView = require('../Mixins/AsNamedView'); templateMixin.call(window.Marionette.TemplateCache); asNamedView.call(window.Marionette.ItemView.prototype); - module.exports = window.Marionette; \ No newline at end of file diff --git a/src/UI/Shims/backbone.validation.js b/src/UI/Shims/backbone.validation.js index b617685b9..158e42265 100644 --- a/src/UI/Shims/backbone.validation.js +++ b/src/UI/Shims/backbone.validation.js @@ -1,6 +1,7 @@ require('backbone'); require('../JsLibraries/backbone.validation'); var $ = require('jquery'); + var jqueryValidation = require('../jQuery/jquery.validation'); jqueryValidation.call($); diff --git a/src/UI/Shims/jquery.signalR.js b/src/UI/Shims/jquery.signalR.js index 8ee34e0f6..70139ccef 100644 --- a/src/UI/Shims/jquery.signalR.js +++ b/src/UI/Shims/jquery.signalR.js @@ -1,6 +1,4 @@ -require('../JsLibraries/jquery.signalR'); -require('jquery'); - require('jquery'); var signalR = require('../JsLibraries/jquery.signalR'); + module.exports = signalR; \ No newline at end of file diff --git a/src/UI/Shims/messenger.js b/src/UI/Shims/messenger.js index 48ac6d11d..f070bb991 100644 --- a/src/UI/Shims/messenger.js +++ b/src/UI/Shims/messenger.js @@ -1,7 +1,6 @@ -require('../JsLibraries/messenger'); -require('jquery'); - require('jquery'); var m = require('../JsLibraries/messenger'); -window.Messenger.options = {theme : 'flat'}; + +window.Messenger.options = { theme : 'flat' }; + module.exports = window.Messenger; \ No newline at end of file diff --git a/src/UI/Shims/moment.js b/src/UI/Shims/moment.js index 17fa5181e..359f88a73 100644 --- a/src/UI/Shims/moment.js +++ b/src/UI/Shims/moment.js @@ -1,6 +1,4 @@ -require('../JsLibraries/moment'); -require('backbone'); - require('backbone'); var backgrid = require('../JsLibraries/moment'); + module.exports = backgrid; \ No newline at end of file