Merge branch 'because-kayone' into develop

This commit is contained in:
Mark McDowall 2013-08-20 18:42:19 -07:00
commit 298bc07be7
15 changed files with 153 additions and 32 deletions

View file

@ -4,8 +4,8 @@ define(['app',
'marionette',
'Settings/Quality/Profile/QualityProfileView',
'Settings/Quality/Profile/EditQualityProfileView',
'Settings/Quality/Profile/QualityProfileSchemaCollection'],
function (App, Marionette, QualityProfileView, EditProfileView, ProfileCollection) {
'Settings/Quality/Profile/QualityProfileSchemaCollection'
], function (App, Marionette, QualityProfileView, EditProfileView, ProfileCollection) {
return Marionette.CompositeView.extend({
itemView : QualityProfileView,
@ -24,7 +24,6 @@ define(['app',
collectionView.ui.addCard.parent('li').before(itemView.el);
},
_addProfile: function () {
var self = this;
var schemaCollection = new ProfileCollection();