deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Preview as button. Disable note submit unless content

Browse source
This commit is contained in:
randx 2012-08-29 08:13:38 +03:00
parent b9b63fc362
commit e5adca1b81
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/note.js
View file

@ -24,6 +24,16 @@ init:
$('.delete-note').live('ajax:success', function() { $('.delete-note').live('ajax:success', function() {
$(this).closest('li').fadeOut(); }); $(this).closest('li').fadeOut(); });
$('#note_note').on('keyup', function(){
var field = $(this);
var closest_submit = field.closest("form").find(".submit_note");
if(field.val() == "") {
closest_submit.attr("disabled", "disabled").addClass("disabled");
} else {
closest_submit.removeAttr("disabled").removeClass("disabled");
}
})
$("#new_note").live("ajax:before", function(){ $("#new_note").live("ajax:before", function(){
$(".submit_note").attr("disabled", "disabled"); $(".submit_note").attr("disabled", "disabled");
}) })
@ -35,6 +45,7 @@ init:
$("#note_note").live("focus", function(){ $("#note_note").live("focus", function(){
$(this).css("height", "80px"); $(this).css("height", "80px");
$('.note_advanced_opts').show(); $('.note_advanced_opts').show();
$(this).closest("form").find(".submit_note").attr("disabled", "disabled");
}); });
$("#note_attachment").change(function(e){ $("#note_attachment").change(function(e){

9
app/views/notes/_form.html.haml
View file

@ -10,12 +10,13 @@
= f.text_area :note, size: 255 = f.text_area :note, size: 255
#preview-note.well.hide #preview-note.well.hide
.hint .hint
= link_to 'Preview', preview_project_notes_path(@project), id: 'preview-link'
.right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}. .right Comments are parsed with #{link_to "Gitlab Flavored Markdown", help_markdown_path, target: '_blank'}.
.clearfix
.row.note_advanced_opts.hide .row.note_advanced_opts.hide
.span2 .span3
= f.submit 'Add Comment', class: "btn primary submit_note", id: "submit_note" = f.submit 'Add Comment', class: "btn primary submit_note grouped", id: "submit_note"
= link_to 'Preview', preview_project_notes_path(@project), class: 'btn grouped', id: 'preview-link'
.span4.notify_opts .span4.notify_opts
%h6.left Notify via email: %h6.left Notify via email:
= label_tag :notify do = label_tag :notify do
@ -26,7 +27,7 @@
= label_tag :notify_author do = label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
%span Commit author %span Commit author
.span6.attachments .span5.attachments
%h6.left Attachment: %h6.left Attachment:
%span.file_name File name... %span.file_name File name...