Merge pull request #1231 from NARKOZ/preview_notes

Preview window is not closed after post

Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
Dmitriy Zaporozhets
2 parents 07fe78b3 0b7e67ad
Showing 2 changed files with 4 additions and 2 deletions Show diff stats
app/assets/javascripts/application.js
app/views/notes/_create_common.js.haml
@@ -72,7 +72,7 @@ $(document).ready(function(){
    * Note markdown preview
    *
    */
-  $('#preview-link').on('click', function(e) {
+  $(document).on('click', '#preview-link', function(e) {
     $('#preview-note').text('Loading...');
  
     var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
 - if note.valid?
   :plain
-    $("#new_note .errors").remove();
+    $("#new_note .error").remove();
     $('#new_note textarea').val("");
+    $('#preview-link').text('Preview');
+    $('#preview-note').hide(); $('#note_note').show();
     NoteList.prepend(#{note.id}, "#{escape_javascript(render partial: "notes/show", locals: {note: note})}");
 - else
   :plain
...	...	@@ -72,7 +72,7 @@ $(document).ready(function(){
72	72	* Note markdown preview
73	73	*
74	74	*/
75		- $('#preview-link').on('click', function(e) {
	75	+ $(document).on('click', '#preview-link', function(e) {
76	76	$('#preview-note').text('Loading...');
77	77
78	78	var previewLinkText = ($(this).text() == 'Preview' ? 'Edit' : 'Preview');
...	...
1	1	- if note.valid?
2	2	:plain
3		- $("#new_note .errors").remove();
	3	+ $("#new_note .error").remove();
4	4	$('#new_note textarea').val("");
	5	+ $('#preview-link').text('Preview');
	6	+ $('#preview-note').hide(); $('#note_note').show();
5	7	NoteList.prepend(#{note.id}, "#{escape_javascript(render partial: "notes/show", locals: {note: note})}");
6	8	- else
7	9	:plain
...	...