Commit 1ec3bd3f authored by Nihad Abbasov's avatar Nihad Abbasov

ability to preview notes

parent 34ba4e13
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
//= require chosen-jquery //= require chosen-jquery
//= require raphael //= require raphael
//= require branch-graph //= require branch-graph
//= require Markdown.Converter
//= require_tree . //= require_tree .
$(document).ready(function(){ $(document).ready(function(){
...@@ -26,7 +27,6 @@ $(document).ready(function(){ ...@@ -26,7 +27,6 @@ $(document).ready(function(){
$(this).select(); $(this).select();
}); });
$('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){ $('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){
var buttons = $('[type="submit"]', this); var buttons = $('[type="submit"]', this);
switch( e.type ){ switch( e.type ){
...@@ -70,6 +70,24 @@ $(document).ready(function(){ ...@@ -70,6 +70,24 @@ $(document).ready(function(){
$(".supp_diff_link").bind("click", function() { $(".supp_diff_link").bind("click", function() {
showDiff(this); showDiff(this);
}); });
/**
* Note markdown preview
*
*/
$('#preview-link').on('click', function(e) {
var note = $('#note_note').val();
if (note.trim().length === 0) { note = 'Nothing to preview'; }
var converter = new Markdown.Converter();
var md_preview = converter.makeHtml(note);
$('#preview-note').html(md_preview);
var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
$(this).text(previewLinkText);
$('#preview-note, #note_note').toggle();
e.preventDefault();
});
}); });
function focusSearch() { function focusSearch() {
...@@ -108,6 +126,6 @@ function showDiff(link) { ...@@ -108,6 +126,6 @@ function showDiff(link) {
})(jQuery); })(jQuery);
function ajaxGet(url) { function ajaxGet(url) {
$.ajax({type: "GET", url: url, dataType: "script"}); $.ajax({type: "GET", url: url, dataType: "script"});
} }
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
= f.hidden_field :noteable_id = f.hidden_field :noteable_id
= f.hidden_field :noteable_type = f.hidden_field :noteable_type
= f.text_area :note, :size => 255 = f.text_area :note, :size => 255
#preview-note.well.hide
%p.hint %p.hint
= link_to "Gitlab Markdown", help_markdown_path, :target => '_blank' = link_to "Gitlab Markdown", help_markdown_path, :target => '_blank'
is enabled. is enabled.
= link_to 'Preview', '#', :id => 'preview-link'
.row.note_advanced_opts.hide .row.note_advanced_opts.hide
.span4 .span4
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment