Big commit:

- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
This commit is contained in:
Robin Ward
2013-03-14 14:45:29 -04:00
parent 7714e2050e
commit ad082cea70
39 changed files with 584 additions and 560 deletions

View File

@@ -156,15 +156,9 @@ Discourse.AdminUser.reopenClass({
},
find: function(username) {
var promise;
promise = new RSVP.Promise();
$.ajax({
url: "/admin/users/" + username,
success: function(result) {
return promise.resolve(Discourse.AdminUser.create(result));
}
});
return promise;
return $.ajax({url: "/admin/users/" + username}).then(function (result) {
return Discourse.AdminUser.create(result);
})
},
findAll: function(query, filter) {

View File

@@ -46,47 +46,15 @@ Discourse.FlaggedPost = Discourse.Post.extend({
}).property('topic_hidden'),
deletePost: function() {
var promise;
promise = new RSVP.Promise();
if (this.get('post_number') === "1") {
return $.ajax("/t/" + this.topic_id, {
type: 'DELETE',
cache: false,
success: function() {
promise.resolve();
},
error: function(e) {
promise.reject();
}
});
return $.ajax("/t/" + this.topic_id, { type: 'DELETE', cache: false });
} else {
return $.ajax("/posts/" + this.id, {
type: 'DELETE',
cache: false,
success: function() {
promise.resolve();
},
error: function(e) {
promise.reject();
}
});
return $.ajax("/posts/" + this.id, { type: 'DELETE', cache: false });
}
},
clearFlags: function() {
var promise;
promise = new RSVP.Promise();
$.ajax("/admin/flags/clear/" + this.id, {
type: 'POST',
cache: false,
success: function() {
promise.resolve();
},
error: function(e) {
promise.reject();
}
});
return promise;
return $.ajax("/admin/flags/clear/" + this.id, { type: 'POST', cache: false });
},
hiddenClass: (function() {

View File

@@ -26,14 +26,8 @@ Discourse.VersionCheck = Discourse.Model.extend({
Discourse.VersionCheck.reopenClass({
find: function() {
var promise = new RSVP.Promise();
$.ajax({
url: '/admin/version_check',
dataType: 'json',
success: function(json) {
promise.resolve(Discourse.VersionCheck.create(json));
}
return $.ajax({ url: '/admin/version_check', dataType: 'json' }).then(function(json) {
return Discourse.VersionCheck.create(json);
});
return promise;
}
});