修复合并出错问题

10 years ago · ccc4d94212
parent fcd7506181
commit ccc4d94212
2 changed files with 3 additions and 7 deletions
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@ -18,7 +18,7 @@
    </div>
  </div>
  <div class="cl"></div>
-
+  <div id="homework_editor" style="display: none"></div>
    <div class="mt10">
      <% if edit_mode %>
          <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %>
@ -76,7 +76,6 @@
 </div>
 <div class="cl"></div>

-
 <script id="t:test-answer-list" type="text/html">
  <div class="mt10">
      <textarea class="InputBox  W320 fl mr10" placeholder="测试输入" required name="program[input][]"></textarea><textarea class="InputBox  W320  fl mr5" placeholder="测试输出" required name="program[output][]"></textarea>
--- a/public/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js
+++ b/public/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js