mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues 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 ControlPanelRegion = require('./Shared/ControlPanel/ControlPanelRegion');
module.exports = (function(){
'use strict';
var Layout = Marionette.Layout.extend({
regions : {
navbarRegion : '#nav-region',
mainRegion : '#main-region'
},
initialize : function(){
this.addRegions({
modalRegion : ModalRegion,
fileBrowserModalRegion : FileBrowserModalRegion,
controlPanelRegion : ControlPanelRegion
});
}
});
return new Layout({el : 'body'});
}).call(this);
var Layout = Marionette.Layout.extend({
regions : {
navbarRegion : '#nav-region',
mainRegion : '#main-region'
},
initialize : function() {
this.addRegions({
modalRegion : ModalRegion,
fileBrowserModalRegion : FileBrowserModalRegion,
controlPanelRegion : ControlPanelRegion
});
}
});
module.exports = new Layout({ el : 'body' });

85
src/UI/Config.js
View File

@ -1,53 +1,52 @@
'use strict';
define(
[
'vent'
], function (vent) {
return {
Events: {
ConfigUpdatedEvent: 'ConfigUpdatedEvent'
},
var vent = require('./vent');
Keys : {
DefaultProfileId : 'DefaultProfileId',
DefaultRootFolderId : 'DefaultRootFolderId',
UseSeasonFolder : 'UseSeasonFolder',
DefaultSeriesType : 'DefaultSeriesType',
MonitorEpisodes : 'MonitorEpisodes',
AdvancedSettings : 'advancedSettings'
},
module.exports = {
Events : {
ConfigUpdatedEvent : 'ConfigUpdatedEvent'
},
getValueBoolean: function (key, defaultValue) {
defaultValue = defaultValue || false;
Keys : {
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) {
var storeValue = window.localStorage.getItem(key);
return this.getValue(key, defaultValue.toString()) === 'true';
},
if (!storeValue) {
return defaultValue;
}
getValue : function(key, 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()) {
return;
}
console.log('Config: [{0}] => [{1}]'.format(key, value));
try {
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));
}
}
};
});
if (this.getValue(key) === value.toString()) {
return;
}
try {
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');
module.exports = NzbDroneController.extend({
addSeries : function(action){
addSeries : function(action) {
this.setTitle('Add Series');
this.showMainRegion(new AddSeriesLayout({action : action}));
this.showMainRegion(new AddSeriesLayout({ action : action }));
},
calendar : function(){
calendar : function() {
this.setTitle('Calendar');
this.showMainRegion(new CalendarLayout());
},
settings : function(action){
settings : function(action) {
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.showMainRegion(new WantedLayout({action : action}));
this.showMainRegion(new WantedLayout({ action : action }));
},
activity : function(action){
activity : function(action) {
this.setTitle('Activity');
this.showMainRegion(new ActivityLayout({action : action}));
this.showMainRegion(new ActivityLayout({ action : action }));
},
rss : function(){
rss : function() {
this.setTitle('RSS');
this.showMainRegion(new ReleaseLayout());
},
system : function(action){
system : function(action) {
this.setTitle('System');
this.showMainRegion(new SystemLayout({action : action}));
this.showMainRegion(new SystemLayout({ action : action }));
},
seasonPass : function(){
seasonPass : function() {
this.setTitle('Season Pass');
this.showMainRegion(new SeasonPassLayout());
},
seriesEditor : function(){
seriesEditor : function() {
this.setTitle('Series Editor');
this.showMainRegion(new SeriesEditorLayout());
}

8
src/UI/LifeCycle.js
View File

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

2
src/UI/Router.js
View File

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

61
src/UI/app.js
View File

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

21
src/UI/main.js
View File

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

33
src/UI/polyfills.js
View File

@ -1,33 +1,29 @@
window.console = window.console || {};
window.console.log = window.console.log || function(){
};
window.console.group = window.console.group || function(){
};
window.console.groupEnd = window.console.groupEnd || function(){
};
window.console.debug = window.console.debug || function(){
};
window.console.warn = window.console.warn || function(){
};
window.console.assert = window.console.assert || function(){
};
if(!String.prototype.startsWith) {
window.console.log = window.console.log || function() {};
window.console.group = window.console.group || function() {};
window.console.groupEnd = window.console.groupEnd || function() {};
window.console.debug = window.console.debug || function() {};
window.console.warn = window.console.warn || function() {};
window.console.assert = window.console.assert || function() {};
if (!String.prototype.startsWith) {
Object.defineProperty(String.prototype, 'startsWith', {
enumerable : false,
configurable : false,
writable : false,
value : function(searchString, position){
value : function(searchString, position) {
position = position || 0;
return this.indexOf(searchString, position) === position;
}
});
}
if(!String.prototype.endsWith) {
if (!String.prototype.endsWith) {
Object.defineProperty(String.prototype, 'endsWith', {
enumerable : false,
configurable : false,
writable : false,
value : function(searchString, position){
value : function(searchString, position) {
position = position || this.length;
position = position - searchString.length;
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);
};
}

1
src/UI/reqres.js
View File

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

1
src/UI/vendor.js
View File

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

67
src/UI/vent.js
View File

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