This commit is contained in:
Ruud
2014-02-08 17:58:45 +01:00
parent a609b401c4
commit c3bc9c8591
27 changed files with 185 additions and 352 deletions
@@ -57,14 +57,16 @@ var Profile = new Class({
self.makeSortable();
// Combine qualities and properties into types
data.types = [];
data.qualities.each(function(quality, nr){
data.types.include({
'quality_identifier': quality,
'finish': data.finish[nr] || false,
'wait_for': data.wait_for[nr] || 0
})
});
if(data.qualities){
data.types = [];
data.qualities.each(function(quality, nr){
data.types.include({
'quality': quality,
'finish': data.finish[nr] || false,
'wait_for': data.wait_for[nr] || 0
})
});
}
if(data.types)
data.types.each(self.addType.bind(self));
@@ -112,16 +114,16 @@ var Profile = new Class({
var self = this;
var data = {
'id' : self.data.id,
'id' : self.data._id,
'label' : self.el.getElement('.quality_label input').get('value'),
'wait_for' : self.el.getElement('.wait_for input').get('value'),
'types': []
}
Array.each(self.type_container.getElements('.type'), function(type){
if(!type.hasClass('deleted') && type.getElement('select').get('value') > 0)
if(!type.hasClass('deleted') && type.getElement('select').get('value') != -1)
data.types.include({
'quality_identifier': type.getElement('select').get('value'),
'quality': type.getElement('select').get('value'),
'finish': +type.getElement('input[type=checkbox]').checked,
'wait_for': 0
});
@@ -156,7 +158,7 @@ var Profile = new Class({
var self = this;
return self.types.filter(function(type){
return type.get('quality_identifier')
return type.get('quality')
});
},
@@ -173,7 +175,7 @@ var Profile = new Class({
(e).preventDefault();
Api.request('profile.delete', {
'data': {
'id': self.data.id
'id': self.data._id
},
'useSpinner': true,
'spinnerOptions': {
@@ -275,7 +277,7 @@ Profile.Type = new Class({
new Element('span.handle')
);
self.el[self.data.quality_identifier ? 'removeClass' : 'addClass']('is_empty');
self.el[self.data.quality ? 'removeClass' : 'addClass']('is_empty');
self.finish_class = new Form.Check(self.finish);
@@ -302,7 +304,7 @@ Profile.Type = new Class({
}).inject(self.qualities)
});
self.qualities.set('value', self.data.quality_identifier);
self.qualities.set('value', self.data.quality);
return self.qualities;
@@ -312,7 +314,7 @@ Profile.Type = new Class({
var self = this;
return {
'quality_identifier': self.qualities.get('value'),
'quality': self.qualities.get('value'),
'finish': +self.finish.checked,
'wait_for': 0
}