summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mathiesen <marius@shortcut.no>2009-10-14 13:25:31 +0200
committerJohan Sørensen <johan@johansorensen.com>2009-11-04 15:23:26 +0100
commit9a948f2834d8cfb84ce06da07eb43b67c35d107b (patch)
tree4dfb7581d897cb847f5968eb3bb778ac6332f35c
parent18161cd65b33604c543ab84ce975d6c17ca1d7d2 (diff)
downloadgitorious-mainline-outdated-9a948f2834d8cfb84ce06da07eb43b67c35d107b.zip
gitorious-mainline-outdated-9a948f2834d8cfb84ce06da07eb43b67c35d107b.tar.gz
gitorious-mainline-outdated-9a948f2834d8cfb84ce06da07eb43b67c35d107b.tar.bz2
Give a visual clue while the comment is being saved
-rw-r--r--app/views/merge_request_versions/_merge_request_version.html.erb3
-rw-r--r--public/javascripts/application.js2
-rw-r--r--public/stylesheets/base.css4
3 files changed, 9 insertions, 0 deletions
diff --git a/app/views/merge_request_versions/_merge_request_version.html.erb b/app/views/merge_request_versions/_merge_request_version.html.erb
index a7b0542..3a4050d 100644
--- a/app/views/merge_request_versions/_merge_request_version.html.erb
+++ b/app/views/merge_request_versions/_merge_request_version.html.erb
@@ -72,6 +72,9 @@
<%= f.hidden_field :path -%>
<%= f.hidden_field :sha1 -%>
</p>
+<p class="progress" style="display:none">
+ <%= image_tag "spinner.gif" -%> Saving...
+</p>
<p>
<input type="button" value="Cancel" class="cancel_button" />
<%= f.submit -%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0ba6142..9f2a5cd 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1006,6 +1006,7 @@ Gitorious.CommentForm = function(path){
commentContainer.find("#comment_body").focus();
var zeForm = commentContainer.find("form");
zeForm.submit(function(){
+ zeForm.find(".progress").show("fast");
jQuery.ajax({
"url": $(this).attr("action"),
"data": $(this).serialize(),
@@ -1016,6 +1017,7 @@ Gitorious.CommentForm = function(path){
},
"error": function(xhr, statusText, errorThrown) {
var errorDisplay = $(zeForm).find(".error");
+ zeForm.find(".progress").hide("fast");
errorDisplay.text("Please make sure your comment is valid");
errorDisplay.show("fast");
}
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index 61c824f..e6c43aa 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -3019,6 +3019,10 @@ Merge request commit selector
.file-diff .comment_container form input[type=submit] {
font-weight: bold;
}
+.file-diff .comment_container form .progress {
+ color: #333;
+}
+
.file-diff-controls {
float: right;
color: #888;