mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
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:
@@ -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) {
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user