codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More promises instead of callbacks.

Browse source
This commit is contained in:
Robin Ward 2013-05-06 14:44:19 -04:00
parent 4200f4107b
commit be191a95da
2 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/discourse/models/composer.js
View file

@ -310,11 +310,14 @@ Discourse.Composer = Discourse.Model.extend({
composer.set('topic.draft_sequence', savedPost.draft_sequence);
}
}, function(error) {
var errors;
errors = $.parseJSON(error.responseText).errors;
promise.reject(errors[0]);
var response = $.parseJSON(error.responseText);
if (response && response.errors) {
promise.reject(errors[0]);
} else {
promise.reject(Em.String.i18n('generic_error'));
}
post.set('cooked', oldCooked);
return composer.set('composeState', OPEN);
composer.set('composeState', OPEN);
});
});
},

30
app/assets/javascripts/discourse/models/post.js
View file

@ -151,14 +151,16 @@ Discourse.Post = Discourse.Model.extend({
data: {
post: { raw: this.get('raw') },
image_sizes: this.get('imageSizes')
},
success: function(result) {
// If we received a category update, update it
if (result.category) Discourse.get('site').updateCategory(result.category);
return typeof complete === "function" ? complete(Discourse.Post.create(result.post)) : void 0;
},
error: function(result) { return typeof error === "function" ? error(result) : void 0; }
}
}).then(function(result) {
// If we received a category update, update it
if (result.category) Discourse.get('site').updateCategory(result.category);
if (complete) complete(Discourse.Post.create(result.post));
}, function(result) {
// Post failed to update
if (error) error(result);
});
} else {
// We're saving a post
@ -178,13 +180,13 @@ Discourse.Post = Discourse.Model.extend({
return Discourse.ajax({
type: 'POST',
url: Discourse.getURL("/posts"),
data: data,
success: function(result) {
return typeof complete === "function" ? complete(Discourse.Post.create(result)) : void 0;
},
error: function(result) {
return typeof error === "function" ? error(result) : void 0;
}
data: data
}).then(function(result) {
// Post created
if (complete) complete(Discourse.Post.create(result));
}, function(result) {
// Failed to create a post
if (error) error(result);
});
}
},