Showing 5 changed files with 34 additions and 28 deletions
+5 -4
templates/compare.html.ep
... ...
@@ -561,14 +561,15 @@
561 561
           <div class="issue-add-comment-title">
562 562
             <%= text_field 'title' => $commits->[0]{title_short} %>
563 563
           </div>
564
-          <div id="write-tab" class="issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
565
-          <div id="preview-tab" class="issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
564
+          <div class="issue-message-write-tab issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
565
+          <div class="issue-message-preview-tab issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
566
+          %= include '/include/issue_comment_icon';
566 567
         </div>
567 568
         <div class="issue-add-comment-body">
568
-          <div id="write-area" class="issue-add-comment-message">
569
+          <div class="issue-message-write-area issue-add-comment-message">
569 570
             <%= text_area 'message' %>
570 571
           </div>
571
-          <div id="preview-area" class="issue-add-comment-preview markdown-body" style="padding:10px">
572
+          <div class="issue-message-preview-area issue-add-comment-preview markdown-body" style="padding:10px">
572 573
           </div>
573 574
           <div class="issue-add-comment-bottom">
574 575
             <div class="issue-add-comment-button-left">
+4 -4
templates/include/issue_message.html.ep
... ...
@@ -45,15 +45,15 @@
45 45
         <form action="<%= url_for %>" method="post">
46 46
           <%= hidden_field 'op' %>
47 47
           <div class="issue-add-comment-header">
48
-            <div id="write-tab" class="issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
49
-            <div id="preview-tab" class="issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
48
+            <div class="issue-message-write-tab issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
49
+            <div class="issue-message-preview-tab issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
50 50
             %= include '/include/issue_comment_icon';
51 51
           </div>
52 52
           <div class="issue-add-comment-body">
53
-            <div id="write-area" class="issue-add-comment-message">
53
+            <div class="issue-message-write-area issue-add-comment-message">
54 54
               <%= text_area 'message' => $issue_message->{message} %>
55 55
             </div>
56
-            <div id="preview-area" class="issue-add-comment-preview markdown-body" style="padding:10px">
56
+            <div class="issue-message-preview-area issue-add-comment-preview markdown-body" style="padding:10px">
57 57
             </div>
58 58
             <div class="issue-add-comment-bottom">
59 59
               <div class="issue-add-comment-button-left">
+16 -12
templates/include/js/issue.html.ep
... ...
@@ -15,25 +15,29 @@ function insertAtCaret(target, str) {
15 15
 }
16 16
 
17 17
 // Click write tab
18
-$('#write-tab').on('click', function () {
19
-  $('#write-tab').find('a').attr('class', '');
20
-  $('#preview-tab').find('a').attr('class', 'disable');
21
-  $('#write-area').css('display', 'block');
22
-  $('#preview-area').css('display', 'none');
18
+$('.issue-message-write-tab').on('click', function () {
19
+  var form = $(this).closest('form');
20
+  
21
+  form.find('.issue-message-write-tab').find('a').attr('class', '');
22
+  form.find('.issue-message-preview-tab').find('a').attr('class', 'disable');
23
+  form.find('.issue-message-write-area').css('display', 'block');
24
+  form.find('.issue-message-preview-area').css('display', 'none');
23 25
 });
24 26
 
25 27
 // Click preview tab
26
-$('#preview-tab').on('click', function () {
27
-  $('#write-tab').find('a').attr('class', 'disable');
28
-  $('#preview-tab').find('a').attr('class', '');
29
-  $('#write-area').css('display', 'none');
30
-  $('#preview-area').css('display', 'block');
28
+$('.issue-message-preview-tab').on('click', function () {
29
+  var form = $(this).closest('form');
30
+
31
+  form.find('.issue-message-write-tab').find('a').attr('class', 'disable');
32
+  form.find('.issue-message-preview-tab').find('a').attr('class', '');
33
+  form.find('.issue-message-write-area').css('display', 'none');
34
+  form.find('.issue-message-preview-area').css('display', 'block');
31 35
   
32
-  var text = $('[name=message]').val();
36
+  var text = form.find('[name=message]').val();
33 37
   
34 38
   $.post('/api/markdown', {text : text}, function (result) {
35 39
     var markdown = result.markdown;
36
-    $('#preview-area').html(markdown);
40
+    form.find('.issue-message-preview-area').html(markdown);
37 41
   });
38 42
 });
39 43
 
+4 -4
templates/issue.html.ep
... ...
@@ -167,15 +167,15 @@
167 167
           <form action="<%= url_for %>" method="post">
168 168
             <%= hidden_field 'op' %>
169 169
             <div class="issue-add-comment-header">
170
-              <div id="write-tab" class="issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
171
-              <div id="preview-tab" class="issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
170
+              <div class="issue-message-write-tab issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
171
+              <div class="issue-message-preview-tab issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
172 172
               %= include '/include/issue_comment_icon';
173 173
             </div>
174 174
             <div class="issue-add-comment-body">
175
-              <div id="write-area" class="issue-add-comment-message">
175
+              <div class="issue-message-write-area issue-add-comment-message">
176 176
                 <%= text_area 'message' %>
177 177
               </div>
178
-              <div id="preview-area" class="issue-add-comment-preview markdown-body" style="padding:10px">
178
+              <div class="issue-message-preview-area issue-add-comment-preview markdown-body" style="padding:10px">
179 179
               </div>
180 180
               <div class="issue-add-comment-bottom">
181 181
                 <div class="issue-add-comment-button-left">
+5 -4
templates/pull.html.ep
... ...
@@ -527,14 +527,15 @@ git push origin <%= $base_branch %>
527 527
           <form action="<%= url_for %>" method="post">
528 528
             <%= hidden_field 'op' %>
529 529
             <div class="issue-add-comment-header">
530
-              <div id="write-tab" class="issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
531
-              <div id="preview-tab" class="issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
530
+              <div class="issue-message-write-tab issue-add-comment-header-tab"><a href="javascript:void(0)">Write</a></div>
531
+              <div class="issue-message-preview-tab issue-add-comment-header-tab"><a class="disable" href="javascript:void(0)">Preview</a></div>
532
+              %= include '/include/issue_comment_icon';
532 533
             </div>
533 534
             <div class="issue-add-comment-body">
534
-              <div id="write-area" class="issue-add-comment-message">
535
+              <div class="issue-message-write-area issue-add-comment-message">
535 536
                 <%= text_area 'message' %>
536 537
               </div>
537
-              <div id="preview-area" class="issue-add-comment-preview markdown-body" style="padding:10px">
538
+              <div class="issue-message-preview-area issue-add-comment-preview markdown-body" style="padding:10px">
538 539
               </div>
539 540
               <div class="issue-add-comment-bottom">
540 541
                 <div class="issue-add-comment-button-left">