github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 01:14:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Calls to Discourse.ajax no longer need getURL -- will be done automatically.

Browse Source
This commit is contained in:
Robin Ward
2013-05-07 13:30:12 -04:00
parent 0b4fc5d81c
commit bd99d5a40c
54 changed files with 202 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/assets/javascripts/discourse.js
View File

@ -23,6 +23,10 @@ Discourse = Ember.Application.createWithMixins({
highestSeenByTopic: {},
getURL: function(url) {
// If it's a non relative URL, return it.
if (url.indexOf('http') === 0) return url;
var u = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
if (u[u.length-1] === '/') {
u = u.substring(0, u.length-1);
@ -173,7 +177,7 @@ Discourse = Ember.Application.createWithMixins({
**/
logout: function() {
Discourse.KeyValueStore.abandonLocal();
Discourse.ajax(Discourse.getURL("/session/") + this.get('currentUser.username'), {
Discourse.ajax("/session/" + this.get('currentUser.username'), {
type: 'DELETE'
}).then(function() {
// Reloading will refresh unbound properties
@ -189,7 +193,8 @@ Discourse = Ember.Application.createWithMixins({
/**
Our own $.ajax method. Makes sure the .then method executes in an Ember runloop
for performance reasons.
for performance reasons. Also automatically adjusts the URL to support installs
in subfolders.
@method ajax
**/
@ -211,13 +216,27 @@ Discourse = Ember.Application.createWithMixins({
}
if (args.success) {
console.log("DEPRECATION: Discourse.ajax should use promises, received 'success' callback");
console.warning("DEPRECATION: Discourse.ajax should use promises, received 'success' callback");
}
if (args.error) {
console.log("DEPRECATION: Discourse.ajax should use promises, received 'error' callback");
console.warning("DEPRECATION: Discourse.ajax should use promises, received 'error' callback");
}
return $.ajax(url, args);
return Ember.Deferred.promise(function (promise) {
var oldSuccess = args.success;
args.success = function(xhr) {
Ember.run(promise, promise.resolve, xhr);
if (oldSuccess) oldSuccess(xhr);
}
var oldError = args.error;
args.error = function(xhr) {
promise.reject(xhr);
if (oldError) oldError(xhr);
}
$.ajax(Discourse.getURL(url), args);
});
},
/**