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

RS, DG; You now can't open the photo upload form while photos are uploading

Browse source
This commit is contained in:
Raphael 2010-08-10 16:56:19 -07:00
parent 3104eeebc9
commit 37bf5b45f1
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/photos/_new_photo.haml
View file

@ -10,11 +10,13 @@
onFinish: function(event, total){ onFinish: function(event, total){
$("#add_photo_button .button").html( "Add Photos" ); $("#add_photo_button .button").html( "Add Photos" );
$("#add_photo_loader").fadeOut(400); $("#add_photo_loader").fadeOut(400);
pane_toggler_button("photo");
}, },
onStart: function(event, total){ onStart: function(event, total){
$("#add_photo_pane").fadeOut(400); $("#add_photo_pane").fadeOut(400);
$("#add_photo_button .button").html( "Uploading Photos" ); $("#add_photo_button .button").html( "Uploading Photos" );
$("#add_photo_loader").fadeIn(400); $("#add_photo_loader").fadeIn(400);
$("#add_photo_button").unbind();
return true; return true;
} }
}); });

25
public/javascripts/view.js
View file

@ -81,17 +81,7 @@ $(document).ready(function(){
}); });
//buttons////// //buttons//////
function pane_toggler_button( name ) {
$("#add_" + name + "_button").toggle(
function(evt){
evt.preventDefault();
$("#add_" + name + "_pane").fadeIn(300);
},function(evt){
evt.preventDefault();
$("#add_" + name +"_pane").fadeOut(200);
}
);
}
pane_toggler_button("album"); pane_toggler_button("album");
pane_toggler_button("group"); pane_toggler_button("group");
@ -113,3 +103,16 @@ $(document).ready(function(){
}); });
});//end document ready });//end document ready
function pane_toggler_button( name ) {
$("#add_" + name + "_button").toggle(
function(evt){
evt.preventDefault();
$("#add_" + name + "_pane").fadeIn(300);
},function(evt){
evt.preventDefault();
$("#add_" + name +"_pane").fadeOut(200);
}
);
}