Merge pull request #1198 from NARKOZ/preview_notes

ability to preview notes

Merge pull request #1198 from NARKOZ/preview_notes
ability to preview notes
Dmitriy Zaporozhets
2 parents 35b45da6 96397803
Showing 4 changed files with 35 additions and 6 deletions Show diff stats
app/assets/javascripts/application.js
app/controllers/notes_controller.rb
app/views/notes/_form.html.haml
config/routes.rb
@@ -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 &lt; 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
	@@ -26,7 +26,6 @@ $(document).ready(function(){		@@ -26,7 +26,6 @@ $(document).ready(function(){
26	$(this).select();	26	$(this).select();
27	});	27	});
28		28
29	-
30	$('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){	29	$('body').on('ajax:complete, ajax:beforeSend, submit', 'form', function(e){
31	var buttons = $('[type="submit"]', this);	30	var buttons = $('[type="submit"]', this);
32	switch( e.type ){	31	switch( e.type ){
	@@ -70,6 +69,26 @@ $(document).ready(function(){		@@ -70,6 +69,26 @@ $(document).ready(function(){
70	$(".supp_diff_link").bind("click", function() {	69	$(".supp_diff_link").bind("click", function() {
71	showDiff(this);	70	showDiff(this);
72	});	71	});
		72	+
		73	+ /**
		74	+ * Note markdown preview
		75	+ *
		76	+ */
		77	+ $('#preview-link').on('click', function(e) {
		78	+ $('#preview-note').text('Loading...');
		79	+
		80	+ var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
		81	+ $(this).text(previewLinkText);
		82	+
		83	+ var note = $('#note_note').val();
		84	+ if (note.trim().length === 0) { note = 'Nothing to preview'; }
		85	+ $.post($(this).attr('href'), {note: note}, function(data) {
		86	+ $('#preview-note').html(data);
		87	+ });
		88	+
		89	+ $('#preview-note, #note_note').toggle();
		90	+ e.preventDefault();
		91	+ });
73	});	92	});
74		93
75	function focusSearch() {	94	function focusSearch() {
	@@ -108,6 +127,6 @@ function showDiff(link) {		@@ -108,6 +127,6 @@ function showDiff(link) {
108	})(jQuery);	127	})(jQuery);
109		128
110		129
111	-function ajaxGet(url) {
112	- $.ajax({type: "GET", url: url, dataType: "script"});	130	+function ajaxGet(url) {
		131	+ $.ajax({type: "GET", url: url, dataType: "script"});
113	}	132	}