open-source-mirrors
/
Readarr
mirror of https://github.com/Readarr/Readarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rjs optimize the app.

Browse Source
pull/6/head
kayone 11 years ago
parent 6b418276b6
commit 3311357df0
12 changed files with 131 additions and 125 deletions
Show Stats Download Patch File Download Diff File

2
Gruntfile.js
Unescape View File

@ -163,7 +163,7 @@ module.exports = function (grunt) {
keepBuildDir : true, keepBuildDir : true,
modules: [{ modules: [{
name: 'app', name: 'app',
exclude: ['JsLibraries/jquery', 'templates.js'] exclude: ['templates.js']
}], }],
} }

2
src/NzbDrone.Api/Frontend/IsCacheableSpecification.cs
Unescape View File

@ -22,7 +22,7 @@ namespace NzbDrone.Api.Frontend
if (context.Request.Path.StartsWith("/api", StringComparison.CurrentCultureIgnoreCase)) return false; if (context.Request.Path.StartsWith("/api", StringComparison.CurrentCultureIgnoreCase)) return false;
if (context.Request.Path.StartsWith("/signalr", StringComparison.CurrentCultureIgnoreCase)) return false; if (context.Request.Path.StartsWith("/signalr", StringComparison.CurrentCultureIgnoreCase)) return false;
if (context.Request.Path.EndsWith("app.js")) return false; if (context.Request.Path.EndsWith("main.js")) return false;
if (context.Request.Path.StartsWith("/log", StringComparison.CurrentCultureIgnoreCase) && if (context.Request.Path.StartsWith("/log", StringComparison.CurrentCultureIgnoreCase) &&
context.Request.Path.EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase)) context.Request.Path.EndsWith(".txt", StringComparison.CurrentCultureIgnoreCase))

1
src/NzbDrone.Api/Frontend/Mappers/IndexHtmlMapper.cs
Unescape View File

@ -55,6 +55,7 @@ namespace NzbDrone.Api.Frontend.Mappers
text = text.Replace(".css", ".css?v=" + BuildInfo.Version); text = text.Replace(".css", ".css?v=" + BuildInfo.Version);
text = text.Replace(".js", ".js?v=" + BuildInfo.Version); text = text.Replace(".js", ".js?v=" + BuildInfo.Version);
text = text.Replace("API_KEY", _configFileProvider.ApiKey); text = text.Replace("API_KEY", _configFileProvider.ApiKey);
text = text.Replace("APP_VERSION", BuildInfo.Version.ToString());
return text; return text;
} }

4
src/NzbDrone.Api/Notifications/NotificationModule.cs
Unescape View File

@ -4,8 +4,8 @@ namespace NzbDrone.Api.Notifications
{ {
public class IndexerModule : ProviderModuleBase<NotificationResource, INotification, NotificationDefinition> public class IndexerModule : ProviderModuleBase<NotificationResource, INotification, NotificationDefinition>
{ {
public IndexerModule(NotificationFactory notificationrFactory) public IndexerModule(NotificationFactory notificationFactory)
: base(notificationrFactory, "notification") : base(notificationFactory, "notification")
{ {
} }

17
src/NzbDrone.Core/Notifications/Notification.cs
Unescape View File

@ -1,17 +0,0 @@
using NzbDrone.Core.ThingiProvider;
namespace NzbDrone.Core.Notifications
{
public class Notification
{
public int Id { get; set; }
public string Name { get; set; }
public string ImplementationName { get; set; }
public string Link { get; set; }
public bool OnGrab { get; set; }
public bool OnDownload { get; set; }
public IProviderConfig Settings { get; set; }
public INotification Instance { get; set; }
public string Implementation { get; set; }
}
}

1
src/NzbDrone.Core/NzbDrone.Core.csproj
Unescape View File

@ -354,7 +354,6 @@
<Compile Include="Notifications\Growl\GrowlSettings.cs" /> <Compile Include="Notifications\Growl\GrowlSettings.cs" />
<Compile Include="Notifications\Growl\TestGrowlCommand.cs" /> <Compile Include="Notifications\Growl\TestGrowlCommand.cs" />
<Compile Include="Notifications\INotification.cs" /> <Compile Include="Notifications\INotification.cs" />
<Compile Include="Notifications\Notification.cs" />
<Compile Include="Notifications\NotificationRepository.cs" /> <Compile Include="Notifications\NotificationRepository.cs" />
<Compile Include="Fluent.cs" /> <Compile Include="Fluent.cs" />
<Compile Include="History\HistoryRepository.cs" /> <Compile Include="History\HistoryRepository.cs" />

26
src/UI/Instrumentation/ErrorHandler.js
Unescape View File

@ -1,11 +1,16 @@
'use strict'; define(
(function () { [
'jquery',
'messenger'
], function ($, Messenger) {
'use strict';
window.alert = function (message) { window.alert = function (message) {
window.Messenger().post(message); new Messenger().post(message);
}; };
var addError = function(message){ var addError = function (message) {
window.$('#errors').append('<div>' + message + '</div>'); $('#errors').append('<div>' + message + '</div>');
}; };
window.onerror = function (msg, url, line) { window.onerror = function (msg, url, line) {
@ -30,7 +35,7 @@
showCloseButton: true showCloseButton: true
}; };
window.Messenger().post(message); new Messenger().post(message);
addError(message.message); addError(message.message);
@ -38,13 +43,13 @@
catch (error) { catch (error) {
console.log('An error occurred while reporting error. ' + error); console.log('An error occurred while reporting error. ' + error);
console.log(msg); console.log(msg);
window.alert('Couldn\'t report JS error. ' + msg); new Messenger().post('Couldn\'t report JS error. ' + msg);
} }
return false; //don't suppress default alerts and logs. return false; //don't suppress default alerts and logs.
}; };
window.$(document).ajaxError(function (event, xmlHttpRequest, ajaxOptions) { $(document).ajaxError(function (event, xmlHttpRequest, ajaxOptions) {
//don't report 200 error codes //don't report 200 error codes
if (xmlHttpRequest.status >= 200 && xmlHttpRequest.status <= 300) { if (xmlHttpRequest.status >= 200 && xmlHttpRequest.status <= 300) {
@ -78,11 +83,10 @@
message.message = '[{0}] {1} : {2}'.format(ajaxOptions.type, xmlHttpRequest.statusText, ajaxOptions.url); message.message = '[{0}] {1} : {2}'.format(ajaxOptions.type, xmlHttpRequest.statusText, ajaxOptions.url);
} }
window.Messenger().post(message); new Messenger().post(message);
addError(message.message); addError(message.message);
return false; return false;
}); });
});
})();

7
src/UI/Require/require.api.js
Unescape View File

@ -1,7 +1,4 @@
define( define([], function () {
[
'jquery'
], function ($) {
'use strict'; 'use strict';
return { return {
load: function (name, parentRequire, onload, config) { load: function (name, parentRequire, onload, config) {
@ -13,7 +10,7 @@ define(
var resource = name.split('!')[0]; var resource = name.split('!')[0];
var url = window.NzbDrone.ApiRoot + '/' + resource; var url = window.NzbDrone.ApiRoot + '/' + resource;
$.ajax({ window.$.ajax({
url: url url: url
}).done(function (data) { }).done(function (data) {
onload(data); onload(data);

60
src/UI/app.js
Unescape View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
require.config({ require.config({
urlArgs: 'v=' + window.NzbDrone.Version,
paths: { paths: {
'backbone' : 'JsLibraries/backbone', 'backbone' : 'JsLibraries/backbone',
'moment' : 'JsLibraries/moment', 'moment' : 'JsLibraries/moment',
@ -22,23 +22,39 @@ require.config({
'signalR' : 'JsLibraries/jquery.signalR', 'signalR' : 'JsLibraries/jquery.signalR',
'jquery.knob' : 'JsLibraries/jquery.knob', 'jquery.knob' : 'JsLibraries/jquery.knob',
'jquery.dotdotdot' : 'JsLibraries/jquery.dotdotdot', 'jquery.dotdotdot' : 'JsLibraries/jquery.dotdotdot',
'jquery' : 'jQuery/jquery.shim', 'messenger' : 'JsLibraries/messenger',
'jquery' : 'JsLibraries/jquery',
'libs' : 'JsLibraries/', 'libs' : 'JsLibraries/',
'api': 'Require/require.api' 'api': 'Require/require.api'
}, },
shim: { shim: {
jquery :{
api: {
deps:
[
'jquery'
]
},
jquery : {
exports: '$' exports: '$'
}, },
signalR: { messenger : {
deps :
[
'jquery'
],
exports: 'Messenger'
},
signalR : {
deps: deps:
[ [
'jquery' 'jquery'
] ]
}, },
bootstrap: { bootstrap : {
deps: deps:
[ [
'jquery' 'jquery'
@ -49,23 +65,24 @@ require.config({
}); });
} }
}, },
backstrech: { backstrech : {
deps: deps:
[ [
'jquery' 'jquery'
] ]
}, },
underscore: { underscore : {
deps : deps :
[ [
'jquery' 'jquery'
], ],
exports: '_' exports: '_'
}, },
backbone: { backbone : {
deps: deps:
[ [
'jquery', 'jquery',
'Instrumentation/ErrorHandler',
'underscore', 'underscore',
'Mixins/jquery.ajax', 'Mixins/jquery.ajax',
'jQuery/ToTheTop' 'jQuery/ToTheTop'
@ -73,7 +90,7 @@ require.config({
exports: 'Backbone' exports: 'Backbone'
}, },
marionette: { marionette : {
deps: deps:
[ [
'backbone', 'backbone',
@ -88,40 +105,40 @@ require.config({
} }
}, },
'jquery.knob': { 'jquery.knob' : {
deps: deps:
[ [
'jquery' 'jquery'
] ]
}, },
'jquery.dotdotdot': { 'jquery.dotdotdot' : {
deps: deps:
[ [
'jquery' 'jquery'
] ]
}, },
'backbone.pageable': { 'backbone.pageable' : {
deps: deps:
[ [
'backbone' 'backbone'
] ]
}, },
'backbone.deepmodel': { 'backbone.deepmodel' : {
deps: deps:
[ [
'backbone', 'backbone',
'underscore' 'underscore'
] ]
}, },
'backbone.validation': { 'backbone.validation' : {
deps : deps :
[ [
'backbone' 'backbone'
], ],
exports: 'Backbone.Validation' exports: 'Backbone.Validation'
}, },
'backbone.modelbinder':{ 'backbone.modelbinder': {
deps : deps:
[ [
'backbone' 'backbone'
] ]
@ -154,7 +171,7 @@ require.config({
}); });
} }
}, },
'backgrid.paginator': { 'backgrid.paginator' : {
exports: 'Backgrid.Extension.Paginator', exports: 'Backgrid.Extension.Paginator',
@ -163,7 +180,7 @@ require.config({
'backgrid' 'backgrid'
] ]
}, },
'backgrid.selectall': { 'backgrid.selectall' : {
exports: 'Backgrid.Extension.SelectAll', exports: 'Backgrid.Extension.SelectAll',
@ -175,6 +192,11 @@ require.config({
} }
}); });
require.config({
urlArgs: 'v=' + window.NzbDrone.Version
});
define( define(
[ [
'jquery', 'jquery',
@ -224,5 +246,5 @@ define(
$('#footer-region .version').html(footerText); $('#footer-region .version').html(footerText);
}); });
app.start(); return app;
}); });

6
src/UI/index.html
Unescape View File

@ -71,10 +71,6 @@
</script> </script>
<script src="/polyfills.js"></script> <script src="/polyfills.js"></script>
<script src="/JsLibraries/jquery.js"></script> <script data-main="main" src="/JsLibraries/require.js"></script>
<script src="/JsLibraries/messenger.js"></script>
<script src="/Instrumentation/ErrorHandler.js"></script>
<script data-main="/app" src="/JsLibraries/require.js"></script>
<script src="/JsLibraries/xrayquire.js"></script> <script src="/JsLibraries/xrayquire.js"></script>
</html> </html>

7
src/UI/jQuery/jquery.shim.js
Unescape View File

@ -1,7 +0,0 @@
'use strict';
define(
[
], function () {
return window.$;
});

11
src/UI/main.js
Unescape View File

@ -0,0 +1,11 @@
require.config({
urlArgs: 'v=' + window.NzbDrone.Version
});
define(
[
'app'
], function (app) {
'use strict';
app.start();
});
Write Preview
Loading…
Cancel
Save