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

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source 
Conflicts:
	public/javascripts/publisher.js
This commit is contained in:
danielvincent 2010-07-03 22:45:56 -07:00
commit 85cee4064b
4 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/blogs/_blog.html.haml
View file

@ -14,4 +14,4 @@
- if mine?(post)
.destroy_link
= link_to 'Delete', blog_path(post), :confirm => 'Are you sure?', :method => :delete
= link_to 'Delete', blog_path(post), :confirm => 'Are you sure?', :method => :delete, :remote=> true

2
app/views/bookmarks/_bookmark.html.haml
View file

@ -15,4 +15,4 @@
- if mine?(post)
.destroy_link
= link_to 'Delete', bookmark_path(post), :confirm => 'Are you sure?', :method => :delete
= link_to 'Delete', bookmark_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true

2
app/views/status_messages/_status_message.html.haml
View file

@ -11,4 +11,4 @@
- if mine?(post)
.destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete, :remote => true

41
public/javascripts/publisher.js
View file

@ -1,38 +1,19 @@
$(document).ready( function() {
$("#publisher_content_pickers .status_message").click(function(){
if( $("#new_status_message").css("display") == "none" ) {
$("#publisher_content_pickers .status_message").click(selectPublisherTab);
$("#publisher_content_pickers .bookmark").click(selectPublisherTab);
$("#publisher_content_pickers .blog").click(selectPublisherTab);
function selectPublisherTab(){
var form_id = "#new_" + this.className
if( $(form_id).css("display") == "none" ) {
$("#publisher_content_pickers").children("li").removeClass("selected");
$("#publisher_form form").fadeOut(50);
$(this).toggleClass("selected");
$("#new_status_message").delay(50).fadeIn(200);
$(form_id).delay(50).fadeIn(200);
}
});
$("#publisher_content_pickers .bookmark").click(function(){
if( $("#new_bookmark").css("display") == "none" ) {
$("#publisher_content_pickers").children("li").removeClass("selected");
$("#publisher_form form").fadeOut(50);
$(this).toggleClass("selected");
$("#new_bookmark").delay(50).fadeIn(200);
}
});
$("#publisher_content_pickers .blog").click(function(){
if( $("#new_blog").css("display") == "none" ) {
$("#publisher_content_pickers").children("li").removeClass("selected");
$("#publisher_form form").fadeOut(50);
$(this).toggleClass("selected");
$("#new_blog").delay(50).fadeIn(200);
}
});
//$("#publisher").mouseout(function(){
//$("#publisher_form form").fadeOut(200);
//$("#publisher_content_pickers li").removeClass("selected");
//});
}
});