Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tutorial: return the $.ajax Deferred from the subscription requests. 

(imported from commit d9154b00720b6055077e4f0e7f92313d121032b4)
This commit is contained in:
Jessica McKellar 2013-04-12 15:36:15 -04:00
parent 6a0c1f66d8
commit 1c437cb0ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zephyr/static/js/subs.js
View File

@ -567,7 +567,7 @@ function ajaxSubscribe(stream) {
// Subscribe yourself to a single stream. // Subscribe yourself to a single stream.
var true_stream_name; var true_stream_name;
$.ajax({ return $.ajax({
type: "POST", type: "POST",
url: "/json/subscriptions/add", url: "/json/subscriptions/add",
dataType: 'json', // This seems to be ignored. We still get back an xhr. dataType: 'json', // This seems to be ignored. We still get back an xhr.
@ -611,7 +611,7 @@ function ajaxUnsubscribe(stream) {
function ajaxSubscribeForCreation(stream, principals, invite_only) { function ajaxSubscribeForCreation(stream, principals, invite_only) {
// Subscribe yourself and possible other people to a new stream. // Subscribe yourself and possible other people to a new stream.
$.ajax({ return $.ajax({
type: "POST", type: "POST",
url: "/json/subscriptions/add", url: "/json/subscriptions/add",
dataType: 'json', // This seems to be ignored. We still get back an xhr. dataType: 'json', // This seems to be ignored. We still get back an xhr.
@ -637,9 +637,9 @@ function ajaxSubscribeForCreation(stream, principals, invite_only) {
exports.tutorial_subscribe_or_add_me_to = function (stream_name) { exports.tutorial_subscribe_or_add_me_to = function (stream_name) {
var stream_status = compose.check_stream_existence(stream_name); var stream_status = compose.check_stream_existence(stream_name);
if (stream_status === 'does-not-exist') { if (stream_status === 'does-not-exist') {
ajaxSubscribeForCreation(stream_name, [page_params.email], false); return ajaxSubscribeForCreation(stream_name, [page_params.email], false);
} else { } else {
ajaxSubscribe(stream_name); return ajaxSubscribe(stream_name);
} }
}; };