settings is fully moved to required.

This commit is contained in:
Keivan Beigi 2013-06-18 18:02:23 -07:00
commit 6f8c73771d
54 changed files with 533 additions and 439 deletions

View file

@ -1,7 +1,7 @@
'use strict';
define(['app', 'Quality/QualityProfileModel'], function () {
define(['app', 'marionette', 'Mixins/AsModelBoundView'], function (App, Marionette, AsModelBoundView) {
NzbDrone.Settings.Quality.Profile.EditQualityProfileView = Backbone.Marionette.ItemView.extend({
var view = Marionette.ItemView.extend({
template: 'Settings/Quality/Profile/EditQualityProfileTemplate',
events: {
@ -51,8 +51,10 @@ define(['app', 'Quality/QualityProfileModel'], function () {
this.model.save();
this.trigger('saved');
NzbDrone.modalRegion.closeModal();
App.modalRegion.closeModal();
}
});
return AsModelBoundView.call(view);
});

View file

@ -1,20 +1,9 @@
'use strict';
define(['app', 'Settings/Quality/Profile/QualityProfileView'], function () {
NzbDrone.Settings.Quality.Profile.QualityProfileCollectionView = Backbone.Marionette.CompositeView.extend({
itemView : NzbDrone.Settings.Quality.Profile.QualityProfileView,
define(['marionette', 'Settings/Quality/Profile/QualityProfileView'], function (Marionette, QualityProfileView) {
return Marionette.CompositeView.extend({
itemView : QualityProfileView,
itemViewContainer: 'tbody',
template : 'Settings/Quality/Profile/QualityProfileCollectionTemplate',
initialize: function (options) {
},
ui: {
},
onCompositeCollectionRendered: function () {
}
template : 'Settings/Quality/Profile/QualityProfileCollectionTemplate'
});
});

View file

@ -2,12 +2,12 @@
define([
'app',
'Quality/QualityProfileCollection',
'marionette',
'Settings/Quality/Profile/EditQualityProfileView'
], function () {
], function (App, Marionette, EditProfileView) {
NzbDrone.Settings.Quality.Profile.QualityProfileView = Backbone.Marionette.ItemView.extend({
return Marionette.ItemView.extend({
template: 'Settings/Quality/Profile/QualityProfileTemplate',
tagName : 'tr',
@ -21,8 +21,8 @@ define([
},
edit: function () {
var view = new NzbDrone.Settings.Quality.Profile.EditQualityProfileView({ model: this.model});
NzbDrone.modalRegion.show(view);
var view = new EditProfileView({ model: this.model});
App.modalRegion.show(view);
},
removeQuality: function () {

View file

@ -1,13 +1,14 @@
"use strict";
define([
'app',
'marionette',
'Quality/QualityProfileCollection',
'Quality/QualitySizeCollection',
'Settings/Quality/Profile/QualityProfileCollectionView',
'Quality/QualitySizeCollection',
'Settings/Quality/Size/QualitySizeCollectionView'
],
function (app, qualityProfileCollection) {
NzbDrone.Settings.Quality.QualityLayout = Backbone.Marionette.Layout.extend({
function (App, Marionette, QualityProfileCollection, QualityProfileCollectionView, QualitySizeCollection, QualitySizeCollectionView) {
return Marionette.Layout.extend({
template: 'Settings/Quality/QualityLayoutTemplate',
regions: {
@ -16,24 +17,16 @@ define([
qualitySize : '#quality-size'
},
ui: {
},
events: {
},
initialize: function (options) {
this.settings = options.settings;
qualityProfileCollection.fetch();
this.qualitySizeCollection = new NzbDrone.Quality.QualitySizeCollection();
QualityProfileCollection.fetch();
this.qualitySizeCollection = new QualitySizeCollection();
this.qualitySizeCollection.fetch();
},
onRender: function () {
this.qualityProfile.show(new NzbDrone.Settings.Quality.Profile.QualityProfileCollectionView({collection: qualityProfileCollection}));
this.qualitySize.show(new NzbDrone.Settings.Quality.Size.QualitySizeCollectionView({collection: this.qualitySizeCollection}));
this.qualityProfile.show(new QualityProfileCollectionView({collection: QualityProfileCollection}));
this.qualitySize.show(new QualitySizeCollectionView({collection: this.qualitySizeCollection}));
}
});
});

View file

@ -1,21 +1,9 @@
'use strict';
define(['app', 'Settings/Quality/Size/QualitySizeView'], function () {
NzbDrone.Settings.Quality.Size.QualitySizeCollectionView = Backbone.Marionette.CompositeView.extend({
itemView : NzbDrone.Settings.Quality.Size.QualitySizeView,
define(['marionette', 'Settings/Quality/Size/QualitySizeView'], function (Marionette, QualitySizeView) {
return Marionette.CompositeView.extend({
itemView : QualitySizeView,
itemViewContainer: '#quality-sizes-container',
template : 'Settings/Quality/Size/QualitySizeCollectionTemplate',
initialize: function () {
},
ui: {
},
onCompositeCollectionRendered: function () {
}
template : 'Settings/Quality/Size/QualitySizeCollectionTemplate'
});
});

View file

@ -1,13 +1,8 @@
'use strict';
define([
'app',
'Quality/QualitySizeCollection',
'bootstrap.slider'
define(['marionette', 'bootstrap.slider'], function (Marionette) {
], function () {
NzbDrone.Settings.Quality.Size.QualitySizeView = Backbone.Marionette.ItemView.extend({
return Marionette.ItemView.extend({
template : 'Settings/Quality/Size/QualitySizeTemplate',
className: 'quality-size-item',