nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move publisher ajax stuff into publisher.js

Browse source
This commit is contained in:
Raphael Sofaer 2011-05-08 20:40:35 -07:00
parent ffd96d989c
commit 9d2849d851
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
public/javascripts/publisher.js
View file

@ -338,6 +338,31 @@ var Publisher = {
}
});
},
onSubmit: function(data, json, xhr){
$("#photodropzone").find('li').remove();
$("#publisher textarea").removeClass("with_attachments").css('paddingBottom', '');
},
onFailure: function(data, json, xhr){
json = $.parseJSON(html.responseText);
if(json.errors.length !== 0){
Diaspora.widgets.alert.alert(json.errors);
}else{
Diaspora.widgets.alert.alert('Failed to post message!');
}
},
onSuccess: function(data, json, xhr){
ContentUpdater.addPostToStream(json.html);
//collapse publisher
Publisher.close();
Publisher.clear();
//Stream.setUpImageLinks();
Stream.setUpAudioLinks();
},
bindAjax: function(){
Publisher.form().bind('ajax:loading', Publisher.onSubmit);
Publisher.form().bind('ajax:failure', Publisher.onFailure);
Publisher.form().bind('ajax:success', Publisher.onSuccess);
},
initialize: function() {
Publisher.cachedForm = Publisher.cachedSubmit =
Publisher.cachedInput = Publisher.cachedHiddenInput = false;
@ -354,6 +379,7 @@ var Publisher = {
Publisher.hiddenInput().val(Publisher.input().val());
Publisher.input().keydown(Publisher.autocompletion.keyDownHandler);
Publisher.input().keyup(Publisher.autocompletion.keyUpHandler);
Publisher.bindAjax();
Publisher.form().find("textarea").bind("focus", function(evt) {
Publisher.open();
});

23
public/javascripts/stream.js
View file

@ -66,29 +66,6 @@ var Stream = {
}
});
$(".new_status_message").live('ajax:loading', function(data, json, xhr) {
$("#photodropzone").find('li').remove();
$("#publisher textarea").removeClass("with_attachments").css('paddingBottom', '');
});
$(".new_status_message").live('ajax:success', function(data, json, xhr) {
ContentUpdater.addPostToStream(json.html);
//collapse publisher
Publisher.close();
Publisher.clear();
//Stream.setUpImageLinks();
Stream.setUpAudioLinks();
});
$(".new_status_message").live('ajax:failure', function(data, html , xhr) {
json = $.parseJSON(html.responseText);
if(json.errors.length !== 0){
Diaspora.widgets.alert.alert(json.errors);
}else{
Diaspora.widgets.alert.alert('Failed to post message!');
}
});
$(stream_string + ".new_comment").live('ajax:failure', function(data, html, xhr) {
Diaspora.widgets.alert.alert('Failed to post message!');
});