Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI Cleanup - Updated root tree.

This commit is contained in:
Taloth Saldono 2015-02-13 22:06:34 +01:00
parent 70bfad4e6a
commit 29d9e3dadf
11 changed files with 181 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/UI/AppLayout.js
View File

@ -3,20 +3,18 @@ var ModalRegion = require('./Shared/Modal/ModalRegion');
var FileBrowserModalRegion = require('./Shared/FileBrowser/FileBrowserModalRegion'); var FileBrowserModalRegion = require('./Shared/FileBrowser/FileBrowserModalRegion');
var ControlPanelRegion = require('./Shared/ControlPanel/ControlPanelRegion'); var ControlPanelRegion = require('./Shared/ControlPanel/ControlPanelRegion');
module.exports = (function(){ var Layout = Marionette.Layout.extend({
'use strict'; regions : {
var Layout = Marionette.Layout.extend({ navbarRegion : '#nav-region',
regions : { mainRegion : '#main-region'
navbarRegion : '#nav-region', },
mainRegion : '#main-region'
}, initialize : function() {
initialize : function(){ this.addRegions({
this.addRegions({ modalRegion : ModalRegion,
modalRegion : ModalRegion, fileBrowserModalRegion : FileBrowserModalRegion,
fileBrowserModalRegion : FileBrowserModalRegion, controlPanelRegion : ControlPanelRegion
controlPanelRegion : ControlPanelRegion });
}); }
} });
}); module.exports = new Layout({ el : 'body' });
return new Layout({el : 'body'});
}).call(this);

85
src/UI/Config.js
View File

@ -1,53 +1,52 @@
'use strict'; var vent = require('./vent');
define(
[
'vent'
], function (vent) {
return {
Events: {
ConfigUpdatedEvent: 'ConfigUpdatedEvent'
},
Keys : { module.exports = {
DefaultProfileId : 'DefaultProfileId', Events : {
DefaultRootFolderId : 'DefaultRootFolderId', ConfigUpdatedEvent : 'ConfigUpdatedEvent'
UseSeasonFolder : 'UseSeasonFolder', },
DefaultSeriesType : 'DefaultSeriesType',
MonitorEpisodes : 'MonitorEpisodes',
AdvancedSettings : 'advancedSettings'
},
getValueBoolean: function (key, defaultValue) { Keys : {
defaultValue = defaultValue || false; DefaultProfileId : 'DefaultProfileId',
DefaultRootFolderId : 'DefaultRootFolderId',
UseSeasonFolder : 'UseSeasonFolder',
DefaultSeriesType : 'DefaultSeriesType',
MonitorEpisodes : 'MonitorEpisodes',
AdvancedSettings : 'advancedSettings'
},
return this.getValue(key, defaultValue.toString()) === 'true'; getValueBoolean : function(key, defaultValue) {
}, defaultValue = defaultValue || false;
getValue: function (key, defaultValue) { return this.getValue(key, defaultValue.toString()) === 'true';
var storeValue = window.localStorage.getItem(key); },
if (!storeValue) { getValue : function(key, defaultValue) {
return defaultValue; var storeValue = window.localStorage.getItem(key);
}
return storeValue.toString(); if (!storeValue) {
}, return defaultValue;
}
setValue: function (key, value) { return storeValue.toString();
},
console.log('Config: [{0}] => [{1}]'.format(key, value)); setValue : function(key, value) {
if (this.getValue(key) === value.toString()) { console.log('Config: [{0}] => [{1}]'.format(key, value));
return;
}
try { if (this.getValue(key) === value.toString()) {
window.localStorage.setItem(key, value); return;
vent.trigger(this.Events.ConfigUpdatedEvent, {key: key, value: value}); }
}
catch (error) { try {
console.error('Unable to save config: [{0}] => [{1}]'.format(key, value)); window.localStorage.setItem(key, value);
} vent.trigger(this.Events.ConfigUpdatedEvent, {
} key : key,
}; value : value
}); });
}
catch (error) {
console.error('Unable to save config: [{0}] => [{1}]'.format(key, value));
}
}
};

36
src/UI/Controller.js
View File

@ -12,39 +12,47 @@ var SeasonPassLayout = require('./SeasonPass/SeasonPassLayout');
var SeriesEditorLayout = require('./Series/Editor/SeriesEditorLayout'); var SeriesEditorLayout = require('./Series/Editor/SeriesEditorLayout');
module.exports = NzbDroneController.extend({ module.exports = NzbDroneController.extend({
addSeries : function(action){ addSeries : function(action) {
this.setTitle('Add Series'); this.setTitle('Add Series');
this.showMainRegion(new AddSeriesLayout({action : action})); this.showMainRegion(new AddSeriesLayout({ action : action }));
}, },
calendar : function(){
calendar : function() {
this.setTitle('Calendar'); this.setTitle('Calendar');
this.showMainRegion(new CalendarLayout()); this.showMainRegion(new CalendarLayout());
}, },
settings : function(action){
settings : function(action) {
this.setTitle('Settings'); this.setTitle('Settings');
this.showMainRegion(new SettingsLayout({action : action})); this.showMainRegion(new SettingsLayout({ action : action }));
}, },
wanted : function(action){
wanted : function(action) {
this.setTitle('Wanted'); this.setTitle('Wanted');
this.showMainRegion(new WantedLayout({action : action})); this.showMainRegion(new WantedLayout({ action : action }));
}, },
activity : function(action){
activity : function(action) {
this.setTitle('Activity'); this.setTitle('Activity');
this.showMainRegion(new ActivityLayout({action : action})); this.showMainRegion(new ActivityLayout({ action : action }));
}, },
rss : function(){
rss : function() {
this.setTitle('RSS'); this.setTitle('RSS');
this.showMainRegion(new ReleaseLayout()); this.showMainRegion(new ReleaseLayout());
}, },
system : function(action){
system : function(action) {
this.setTitle('System'); this.setTitle('System');
this.showMainRegion(new SystemLayout({action : action})); this.showMainRegion(new SystemLayout({ action : action }));
}, },
seasonPass : function(){
seasonPass : function() {
this.setTitle('Season Pass'); this.setTitle('Season Pass');
this.showMainRegion(new SeasonPassLayout()); this.showMainRegion(new SeasonPassLayout());
}, },
seriesEditor : function(){
seriesEditor : function() {
this.setTitle('Series Editor'); this.setTitle('Series Editor');
this.showMainRegion(new SeriesEditorLayout()); this.showMainRegion(new SeriesEditorLayout());
} }

8
src/UI/LifeCycle.js
View File

@ -1,5 +1,3 @@
module.exports = (function(){ window.onbeforeunload = function() {
window.onbeforeunload = function(){ window.NzbDrone.unloading = true;
window.NzbDrone.unloading = true; };
};
}).call(this);

2
src/UI/Router.js
View File

@ -19,7 +19,7 @@ module.exports = Marionette.AppRouter.extend({
'system' : 'system', 'system' : 'system',
'system/:action' : 'system', 'system/:action' : 'system',
'seasonpass' : 'seasonPass', 'seasonpass' : 'seasonPass',
'serieseditor' : 'seriesEditor', 'serieseditor' : 'seriesEditor',
':whatever' : 'showNotFound' ':whatever' : 'showNotFound'
} }
}); });

61
src/UI/app.js
View File

@ -34,18 +34,16 @@ require.config({
}, },
shim : { shim : {
api : {
api : {
deps : ['jquery'] deps : ['jquery']
}, },
jquery : { jquery : {
exports : '$' exports : '$'
}, },
messenger : { messenger : {
deps : ['jquery'], deps : ['jquery'],
exports : 'Messenger', exports : 'Messenger',
init : function(){ init : function() {
window.Messenger.options = { window.Messenger.options = {
theme : 'flat' theme : 'flat'
}; };
@ -58,7 +56,10 @@ require.config({
deps : ['jquery'] deps : ['jquery']
}, },
'bootstrap.tagsinput' : { 'bootstrap.tagsinput' : {
deps : ['bootstrap', 'typeahead'] deps : [
'bootstrap',
'typeahead'
]
}, },
backstrech : { backstrech : {
deps : ['jquery'] deps : ['jquery']
@ -68,18 +69,25 @@ require.config({
exports : '_' exports : '_'
}, },
backbone : { backbone : {
deps : ['jquery', 'Instrumentation/ErrorHandler', 'underscore', 'Mixins/jquery.ajax', 'jQuery/ToTheTop'], deps : [
'jquery',
'Instrumentation/ErrorHandler',
'underscore',
'Mixins/jquery.ajax',
'jQuery/ToTheTop'
],
exports : 'Backbone' exports : 'Backbone'
}, },
marionette : { marionette : {
deps : ['backbone', 'Handlebars/backbone.marionette.templates', 'Mixins/AsNamedView'], deps : [
'backbone',
'Handlebars/backbone.marionette.templates',
'Mixins/AsNamedView'
],
exports : 'Marionette', exports : 'Marionette',
init : function(Backbone, TemplateMixin, AsNamedView){ init : function(Backbone, TemplateMixin, AsNamedView) {
TemplateMixin.call(window.Marionette.TemplateCache); TemplateMixin.call(window.Marionette.TemplateCache);
AsNamedView.call(window.Marionette.ItemView.prototype); AsNamedView.call(window.Marionette.ItemView.prototype);
} }
}, },
'typeahead' : { 'typeahead' : {
@ -101,7 +109,10 @@ require.config({
deps : ['backbone'] deps : ['backbone']
}, },
'backbone.deepmodel' : { 'backbone.deepmodel' : {
deps : ['backbone', 'underscore'] deps : [
'backbone',
'underscore'
]
}, },
'backbone.validation' : { 'backbone.validation' : {
deps : ['backbone'], deps : ['backbone'],
@ -111,17 +122,17 @@ require.config({
deps : ['backbone'] deps : ['backbone']
}, },
'backbone.collectionview' : { 'backbone.collectionview' : {
deps : ['backbone', 'jquery-ui'], deps : [
'backbone',
'jquery-ui'
],
exports : 'Backbone.CollectionView' exports : 'Backbone.CollectionView'
}, },
backgrid : { backgrid : {
deps : ['backbone'], deps : ['backbone'],
exports : 'Backgrid', exports : 'Backgrid',
init : function() {
init : function(){ require(['Shared/Grid/HeaderCell'], function() {
require(['Shared/Grid/HeaderCell'], function(){
window.Backgrid.Column.prototype.defaults = { window.Backgrid.Column.prototype.defaults = {
name : undefined, name : undefined,
label : undefined, label : undefined,
@ -137,16 +148,12 @@ require.config({
} }
}, },
'backgrid.paginator' : { 'backgrid.paginator' : {
deps : ['backgrid'],
exports : 'Backgrid.Extension.Paginator', exports : 'Backgrid.Extension.Paginator'
deps : ['backgrid']
}, },
'backgrid.selectall' : { 'backgrid.selectall' : {
deps : ['backgrid'],
exports : 'Backgrid.Extension.SelectRowCell', exports : 'Backgrid.Extension.SelectRowCell'
deps : ['backgrid']
} }
} }
}); });

21
src/UI/main.js
View File

@ -1,4 +1,4 @@
var $ = require('jquery'); var $ = require('jquery');
var Backbone = require('backbone'); var Backbone = require('backbone');
var Marionette = require('marionette'); var Marionette = require('marionette');
var RouteBinder = require('./jQuery/RouteBinder'); var RouteBinder = require('./jQuery/RouteBinder');
@ -23,13 +23,18 @@ new SeriesController();
new ModalController(); new ModalController();
new ControlPanelController(); new ControlPanelController();
new Router(); new Router();
var app = new Marionette.Application(); var app = new Marionette.Application();
app.addInitializer(function(){
app.addInitializer(function() {
console.log('starting application'); console.log('starting application');
}); });
app.addInitializer(SignalRBroadcaster.appInitializer, {app : app});
app.addInitializer(Tooltip.appInitializer, {app : app}); app.addInitializer(SignalRBroadcaster.appInitializer, { app : app });
app.addInitializer(function(){
app.addInitializer(Tooltip.appInitializer, { app : app });
app.addInitializer(function() {
Backbone.history.start({ Backbone.history.start({
pushState : true, pushState : true,
root : serverStatusModel.get('urlBase') root : serverStatusModel.get('urlBase')
@ -38,13 +43,15 @@ app.addInitializer(function(){
AppLayout.navbarRegion.show(new NavbarLayout()); AppLayout.navbarRegion.show(new NavbarLayout());
$('body').addClass('started'); $('body').addClass('started');
}); });
app.addInitializer(function(){
app.addInitializer(function() {
var footerText = serverStatusModel.get('version'); var footerText = serverStatusModel.get('version');
if(serverStatusModel.get('branch') !== 'master') { if (serverStatusModel.get('branch') !== 'master') {
footerText += '</br>' + serverStatusModel.get('branch'); footerText += '</br>' + serverStatusModel.get('branch');
} }
$('#footer-region .version').html(footerText); $('#footer-region .version').html(footerText);
}); });
app.start(); app.start();
module.exports = app; module.exports = app;

33
src/UI/polyfills.js
View File

@ -1,33 +1,29 @@
window.console = window.console || {}; window.console = window.console || {};
window.console.log = window.console.log || function(){ window.console.log = window.console.log || function() {};
}; window.console.group = window.console.group || function() {};
window.console.group = window.console.group || function(){ window.console.groupEnd = window.console.groupEnd || function() {};
}; window.console.debug = window.console.debug || function() {};
window.console.groupEnd = window.console.groupEnd || function(){ window.console.warn = window.console.warn || function() {};
}; window.console.assert = window.console.assert || function() {};
window.console.debug = window.console.debug || function(){
}; if (!String.prototype.startsWith) {
window.console.warn = window.console.warn || function(){
};
window.console.assert = window.console.assert || function(){
};
if(!String.prototype.startsWith) {
Object.defineProperty(String.prototype, 'startsWith', { Object.defineProperty(String.prototype, 'startsWith', {
enumerable : false, enumerable : false,
configurable : false, configurable : false,
writable : false, writable : false,
value : function(searchString, position){ value : function(searchString, position) {
position = position || 0; position = position || 0;
return this.indexOf(searchString, position) === position; return this.indexOf(searchString, position) === position;
} }
}); });
} }
if(!String.prototype.endsWith) {
if (!String.prototype.endsWith) {
Object.defineProperty(String.prototype, 'endsWith', { Object.defineProperty(String.prototype, 'endsWith', {
enumerable : false, enumerable : false,
configurable : false, configurable : false,
writable : false, writable : false,
value : function(searchString, position){ value : function(searchString, position) {
position = position || this.length; position = position || this.length;
position = position - searchString.length; position = position - searchString.length;
var lastIndex = this.lastIndexOf(searchString); var lastIndex = this.lastIndexOf(searchString);
@ -35,8 +31,9 @@ if(!String.prototype.endsWith) {
} }
}); });
} }
if(!('contains' in String.prototype)) {
String.prototype.contains = function(str, startIndex){ if (!('contains' in String.prototype)) {
String.prototype.contains = function(str, startIndex) {
return -1 !== String.prototype.indexOf.call(this, str, startIndex); return -1 !== String.prototype.indexOf.call(this, str, startIndex);
}; };
} }

1
src/UI/reqres.js
View File

@ -1,6 +1,7 @@
var Wreqr = require('./JsLibraries/backbone.wreqr'); var Wreqr = require('./JsLibraries/backbone.wreqr');
var reqres = new Wreqr.RequestResponse(); var reqres = new Wreqr.RequestResponse();
reqres.Requests = { reqres.Requests = {
GetEpisodeFileById : 'GetEpisodeFileById', GetEpisodeFileById : 'GetEpisodeFileById',
GetAlternateNameBySeasonNumber : 'GetAlternateNameBySeasonNumber' GetAlternateNameBySeasonNumber : 'GetAlternateNameBySeasonNumber'

1
src/UI/vendor.js
View File

@ -17,7 +17,6 @@ require('zero.clipboard');
require('bootstrap'); require('bootstrap');
require('bootstrap.tagsinput'); require('bootstrap.tagsinput');
/*Backbone*/ /*Backbone*/
require('backbone'); require('backbone');
require('backbone.deepmodel'); require('backbone.deepmodel');

67
src/UI/vent.js
View File

@ -1,35 +1,36 @@
var Wreqr = require('./JsLibraries/backbone.wreqr'); var Wreqr = require('./JsLibraries/backbone.wreqr');
module.exports = (function(){ var vent = new Wreqr.EventAggregator();
'use strict';
var vent = new Wreqr.EventAggregator(); vent.Events = {
vent.Events = { SeriesAdded : 'series:added',
SeriesAdded : 'series:added', SeriesDeleted : 'series:deleted',
SeriesDeleted : 'series:deleted', CommandComplete : 'command:complete',
CommandComplete : 'command:complete', ServerUpdated : 'server:updated',
ServerUpdated : 'server:updated', EpisodeFileDeleted : 'episodefile:deleted'
EpisodeFileDeleted : 'episodefile:deleted' };
};
vent.Commands = { vent.Commands = {
EditSeriesCommand : 'EditSeriesCommand', EditSeriesCommand : 'EditSeriesCommand',
DeleteSeriesCommand : 'DeleteSeriesCommand', DeleteSeriesCommand : 'DeleteSeriesCommand',
OpenModalCommand : 'OpenModalCommand', OpenModalCommand : 'OpenModalCommand',
CloseModalCommand : 'CloseModalCommand', CloseModalCommand : 'CloseModalCommand',
ShowEpisodeDetails : 'ShowEpisodeDetails', ShowEpisodeDetails : 'ShowEpisodeDetails',
ShowHistoryDetails : 'ShowHistoryDetails', ShowHistoryDetails : 'ShowHistoryDetails',
ShowLogDetails : 'ShowLogDetails', ShowLogDetails : 'ShowLogDetails',
SaveSettings : 'saveSettings', SaveSettings : 'saveSettings',
ShowLogFile : 'showLogFile', ShowLogFile : 'showLogFile',
ShowRenamePreview : 'showRenamePreview', ShowRenamePreview : 'showRenamePreview',
ShowFileBrowser : 'showFileBrowser', ShowFileBrowser : 'showFileBrowser',
CloseFileBrowser : 'closeFileBrowser', CloseFileBrowser : 'closeFileBrowser',
OpenControlPanelCommand : 'OpenControlPanelCommand', OpenControlPanelCommand : 'OpenControlPanelCommand',
CloseControlPanelCommand : 'CloseControlPanelCommand' CloseControlPanelCommand : 'CloseControlPanelCommand'
}; };
vent.Hotkeys = {
NavbarSearch : 'navbar:search', vent.Hotkeys = {
SaveSettings : 'settings:save', NavbarSearch : 'navbar:search',
ShowHotkeys : 'hotkeys:show' SaveSettings : 'settings:save',
}; ShowHotkeys : 'hotkeys:show'
return vent; };
}).call(this);
module.exports = vent;