Merge pull request #1198 from NARKOZ/preview_notes
ability to preview notes
This commit is contained in:
commit
5fd0e7ba11
|
@ -26,7 +26,6 @@ $(document).ready(function(){
|
|||
$(this).select();
|
||||
});
|
||||
|
||||
|
||||
$('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){
|
||||
var buttons = $('[type="submit"]', this);
|
||||
switch( e.type ){
|
||||
|
@ -70,6 +69,26 @@ $(document).ready(function(){
|
|||
$(".supp_diff_link").bind("click", function() {
|
||||
showDiff(this);
|
||||
});
|
||||
|
||||
/**
|
||||
* Note markdown preview
|
||||
*
|
||||
*/
|
||||
$('#preview-link').on('click', function(e) {
|
||||
$('#preview-note').text('Loading...');
|
||||
|
||||
var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
|
||||
$(this).text(previewLinkText);
|
||||
|
||||
var note = $('#note_note').val();
|
||||
if (note.trim().length === 0) { note = 'Nothing to preview'; }
|
||||
$.post($(this).attr('href'), {note: note}, function(data) {
|
||||
$('#preview-note').html(data);
|
||||
});
|
||||
|
||||
$('#preview-note, #note_note').toggle();
|
||||
e.preventDefault();
|
||||
});
|
||||
});
|
||||
|
||||
function focusSearch() {
|
||||
|
@ -108,6 +127,6 @@ function showDiff(link) {
|
|||
})(jQuery);
|
||||
|
||||
|
||||
function ajaxGet(url) {
|
||||
$.ajax({type: "GET", url: url, dataType: "script"});
|
||||
function ajaxGet(url) {
|
||||
$.ajax({type: "GET", url: url, dataType: "script"});
|
||||
}
|
||||
|
|
|
@ -33,7 +33,11 @@ class NotesController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
protected
|
||||
def preview
|
||||
render :text => view_context.markdown(params[:note])
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def notes
|
||||
@notes = Notes::LoadContext.new(project, current_user, params).execute
|
||||
|
|
|
@ -7,10 +7,12 @@
|
|||
|
||||
= f.hidden_field :noteable_id
|
||||
= f.hidden_field :noteable_type
|
||||
= f.text_area :note, :size => 255
|
||||
= f.text_area :note, :size => 255
|
||||
#preview-note.well.hide
|
||||
%p.hint
|
||||
= link_to "Gitlab Markdown", help_markdown_path, :target => '_blank'
|
||||
is enabled.
|
||||
= link_to 'Preview', preview_project_notes_path(@project), :id => 'preview-link'
|
||||
|
||||
.row.note_advanced_opts.hide
|
||||
.span2
|
||||
|
|
|
@ -203,7 +203,11 @@ Gitlab::Application.routes.draw do
|
|||
get :search
|
||||
end
|
||||
end
|
||||
resources :notes, :only => [:index, :create, :destroy]
|
||||
resources :notes, :only => [:index, :create, :destroy] do
|
||||
collection do
|
||||
post :preview
|
||||
end
|
||||
end
|
||||
end
|
||||
root :to => "dashboard#index"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue