diff --git a/NzbDrone.Web/_backboneApp/.idea/codeStyleSettings.xml b/NzbDrone.Web/_backboneApp/.idea/codeStyleSettings.xml
index 9178b389f..bf82eecc0 100644
--- a/NzbDrone.Web/_backboneApp/.idea/codeStyleSettings.xml
+++ b/NzbDrone.Web/_backboneApp/.idea/codeStyleSettings.xml
@@ -6,8 +6,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/Project_Default.xml b/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..8c90d9bfe
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,652 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/profiles_settings.xml b/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 000000000..3b312839b
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/.idea/jsLibraryMappings.xml b/NzbDrone.Web/_backboneApp/.idea/jsLibraryMappings.xml
index 340c4837a..4bc11dfec 100644
--- a/NzbDrone.Web/_backboneApp/.idea/jsLibraryMappings.xml
+++ b/NzbDrone.Web/_backboneApp/.idea/jsLibraryMappings.xml
@@ -2,12 +2,6 @@
-
-
-
-
-
-
diff --git a/NzbDrone.Web/_backboneApp/.idea/jsLinters/jshint.xml b/NzbDrone.Web/_backboneApp/.idea/jsLinters/jshint.xml
new file mode 100644
index 000000000..71feed903
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/.idea/jsLinters/jshint.xml
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/NzbDrone.Web/_backboneApp/.idea/misc.xml b/NzbDrone.Web/_backboneApp/.idea/misc.xml
index ca6537212..1162f4382 100644
--- a/NzbDrone.Web/_backboneApp/.idea/misc.xml
+++ b/NzbDrone.Web/_backboneApp/.idea/misc.xml
@@ -1,8 +1,5 @@
-
- jar:file:\C:\Program Files (x86)\JetBrains\WebStorm 5.0.4\lib\webide.jar!\resources\html5-schema\html5.rnc
-
diff --git a/NzbDrone.Web/_backboneApp/.idea/scopes/jsLibraries.xml b/NzbDrone.Web/_backboneApp/.idea/scopes/jsLibraries.xml
new file mode 100644
index 000000000..33839e3b9
--- /dev/null
+++ b/NzbDrone.Web/_backboneApp/.idea/scopes/jsLibraries.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/NzbDrone.Web/_backboneApp/.idea/vcs.xml b/NzbDrone.Web/_backboneApp/.idea/vcs.xml
index def6a6a18..9ab281ac8 100644
--- a/NzbDrone.Web/_backboneApp/.idea/vcs.xml
+++ b/NzbDrone.Web/_backboneApp/.idea/vcs.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/NzbDrone.Web/_backboneApp/.idea/workspace.xml b/NzbDrone.Web/_backboneApp/.idea/workspace.xml
index 4275ea33a..73c9f961c 100644
--- a/NzbDrone.Web/_backboneApp/.idea/workspace.xml
+++ b/NzbDrone.Web/_backboneApp/.idea/workspace.xml
@@ -1,9 +1,62 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -18,66 +71,96 @@
+
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -90,14 +173,32 @@
-
-
+
+
+
+
+
@@ -114,19 +215,85 @@
+
+ AnonymousFunctionJS
+
+
+ BlockStatementJS
+
+
+ CallerJS
+
+
+ CommaExpressionJS
+
+
+ ConditionalExpressionJS
+
+
+ ConfusingFloatingPointLiteralJS
+
+
+ ConfusingPlusesOrMinusesJS
+
+
+ DynamicallyGeneratedCodeJS
+
+
+ EmptyStatementBodyJS
+
+
+ IncrementDecrementResultUsedJS
+
JavaScript
+
+ MagicNumberJS
+
+
+ NegatedConditionalExpressionJS
+
+
+ NegatedIfStatementJS
+
+
+ NestedConditionalExpressionJS
+
+
+ NestedFunctionJS
+
+
+ OctalIntegerJS
+
+
+ OverlyComplexArithmeticExpressionJS
+
+
+ OverlyComplexBooleanExpressionJS
+
+
+ PointlessArithmeticExpressionJS
+
+
+ Potentially confusing code constructsJavaScript
+
+
+ VoidExpressionJS
+
+
+ WithStatementJS
+
- ActionScript specificJavaScript
+ CommaExpressionJS
-
+
@@ -152,7 +319,6 @@
-
@@ -181,7 +347,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -199,24 +379,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -226,42 +434,44 @@
-
+ C:\Users\Keivan\AppData\Roaming\Subversion
false
+
1360855538312
1360855538312
-
+
-
+
+
+
-
+
-
-
+
+
-
-
+
-
-
+
+
@@ -297,9 +507,15 @@
+
+
+
+
+
+
-
+
@@ -310,6 +526,7 @@
+
@@ -329,65 +546,114 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -397,13 +663,17 @@
+ jsLibraries
+
+
+
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/Existing/ImportSeriesView.js b/NzbDrone.Web/_backboneApp/AddSeries/Existing/ImportSeriesView.js
index 88b4632c6..dcfce5fd7 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/Existing/ImportSeriesView.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/Existing/ImportSeriesView.js
@@ -73,11 +73,9 @@ define([
icon.removeClass('icon-search').addClass('icon-spin icon-spinner disabled');
- var self = this;
-
this.collection.fetch({
- data:$.param({ term:this.ui.searchText.val() }),
- success:function (model) {
+ data:{ term:this.ui.searchText.val() },
+ success:function () {
icon.removeClass('icon-spin icon-spinner disabled').addClass('icon-search');
},
@@ -116,8 +114,7 @@ define([
},
refreshItems:function () {
- this.collection.importItems(this.model, qualityProfileCollection);
-
+ this.collection.importItems(this.model);
}
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/RootFolders/RootFolderView.js b/NzbDrone.Web/_backboneApp/AddSeries/RootFolders/RootFolderView.js
index 799c6de7c..0ecc4c305 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/RootFolders/RootFolderView.js
+++ b/NzbDrone.Web/_backboneApp/AddSeries/RootFolders/RootFolderView.js
@@ -27,7 +27,7 @@ define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Shared/AutoComplet
itemView: NzbDrone.AddSeries.RootFolderItemView,
tagName: 'table',
- className: 'table table-hover',
+ className: 'table table-hover'
});
NzbDrone.AddSeries.RootDirView = Backbone.Marionette.Layout.extend({
@@ -39,17 +39,17 @@ define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Shared/AutoComplet
},
regions: {
- currentDirs: '#current-dirs',
+ currentDirs: '#current-dirs'
},
events: {
- 'click .x-add': 'addFolder',
+ 'click .x-add': 'addFolder'
},
onRender: function () {
- this.collection = rootFolders,
+ this.collection = rootFolders;
this.currentDirs.show(new NzbDrone.AddSeries.RootDirListView({ collection: this.collection }));
this.ui.pathInput.folderAutoComplete();
},
@@ -78,11 +78,11 @@ define(['app', 'AddSeries/RootFolders/RootFolderCollection', 'Shared/AutoComplet
context.collection.reset();
} else {
console.log(term);
- context.collection.fetch({ data: $.param({ term: term }) });
+ context.collection.fetch({ data: { term: term } });
}
- },
+ }
});
});
diff --git a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
index 6c3bd8180..6e71f6d94 100644
--- a/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
+++ b/NzbDrone.Web/_backboneApp/AddSeries/addSeries.css
@@ -75,5 +75,5 @@
}
.existing-root-folder-view, h1 {
- padding: 10px 0px 20px 0px;
+ padding: 10px 0 20px 0;
}
diff --git a/NzbDrone.Web/_backboneApp/Series/Edit/EditSeriesView.js b/NzbDrone.Web/_backboneApp/Series/Edit/EditSeriesView.js
index 4255c664b..b28ef6d40 100644
--- a/NzbDrone.Web/_backboneApp/Series/Edit/EditSeriesView.js
+++ b/NzbDrone.Web/_backboneApp/Series/Edit/EditSeriesView.js
@@ -9,7 +9,7 @@ define(['app', 'Series/SeriesModel', 'Series/Delete/DeleteSeriesView', 'Quality/
ui: {
progressbar: '.progress .bar',
qualityProfile: '.x-quality-profile',
- backlogSettings: '.x-backlog-setting',
+ backlogSettings: '.x-backlog-setting'
},
events: {
diff --git a/NzbDrone.Web/_backboneApp/Series/SeriesItemView.js b/NzbDrone.Web/_backboneApp/Series/SeriesItemView.js
index 8ca898f63..7a1392965 100644
--- a/NzbDrone.Web/_backboneApp/Series/SeriesItemView.js
+++ b/NzbDrone.Web/_backboneApp/Series/SeriesItemView.js
@@ -7,14 +7,14 @@ define([
'Series/Edit/EditSeriesView',
'Series/Delete/DeleteSeriesView'
-], function (app, qualityProfileCollection) {
+], function () {
NzbDrone.Series.SeriesItemView = Backbone.Marionette.ItemView.extend({
template: 'Series/SeriesItemTemplate',
tagName: 'tr',
ui: {
- 'progressbar': '.progress .bar',
+ 'progressbar': '.progress .bar'
},
events: {
@@ -40,9 +40,6 @@ define([
removeSeries: function () {
var view = new NzbDrone.Series.DeleteSeriesView({ model: this.model });
NzbDrone.modalRegion.show(view);
- },
- onSave: function () {
- alert("saved!");
}
});
});
diff --git a/NzbDrone.Web/_backboneApp/Shared/NotificationView.js b/NzbDrone.Web/_backboneApp/Shared/NotificationView.js
index 0990f3f4e..4a9c90761 100644
--- a/NzbDrone.Web/_backboneApp/Shared/NotificationView.js
+++ b/NzbDrone.Web/_backboneApp/Shared/NotificationView.js
@@ -25,10 +25,10 @@
initialize: function () {
this.collection = notificationCollection;
- },
+ }
});
- NzbDrone.addInitializer(function (options) {
+ NzbDrone.addInitializer(function () {
NzbDrone.notificationRegion.show(new collectionView());
});
diff --git a/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js b/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js
index 5182ede2e..8cc4f78ea 100644
--- a/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js
+++ b/NzbDrone.Web/_backboneApp/Shared/SpinnerView.js
@@ -1,12 +1,8 @@
define(['app'],function () {
-
NzbDrone.Shared.SpinnerView = Backbone.Marionette.ItemView.extend({
-
template: 'Shared/SpinnerTemplate',
- className: 'nz-spinner row',
-
+ className: 'nz-spinner row'
});
-
});
diff --git a/NzbDrone.Web/_backboneApp/app.js b/NzbDrone.Web/_backboneApp/app.js
index bd5a3c2b5..3163ac708 100644
--- a/NzbDrone.Web/_backboneApp/app.js
+++ b/NzbDrone.Web/_backboneApp/app.js
@@ -50,7 +50,7 @@ define('app', function () {
};
- window.NzbDrone.addInitializer(function (options) {
+ window.NzbDrone.addInitializer(function () {
console.log('starting application');