From e4559dce78db678367e3e6b7a54f75f1bca5a08d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 1 Sep 2015 16:30:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BD=9C=E4=B8=9A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_form.html.erb |  1 +
 app/views/users/_user_homework_list.html.erb |  3 ++-
 app/views/users/user_homeworks.html.erb      | 13 -------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb
index 9b4bfb903..7a9e55205 100644
--- a/app/views/users/_user_homework_form.html.erb
+++ b/app/views/users/_user_homework_form.html.erb
@@ -72,6 +72,7 @@
   <input type="hidden" name="homework_type" value="1">
 
 </div>
+  </div>
 <div class="cl"></div>
 
 
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index faa09ef70..e1bbf6e1c 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -53,4 +53,5 @@
     </div><!----HomeWork end-->
 <% end%>
 
-<input type="hidden" value="<%= page%>" id="user_show_more_homework" />
\ No newline at end of file
+<input type="hidden" value="<%= page%>" />
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore mt10 f_grey"%>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index d401ea314..bc314565a 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -1,17 +1,4 @@
 <script type="text/javascript">
-  var scrollHandler = function(){
-      if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-          $.get(
-                  '<%= user_homeworks_user_path(User.current.id)%>',
-                  { page : $("#user_show_more_homework").val()},
-                  function (data) {
-
-                  }
-          );
-      }
-  };
-  $(window).scroll(scrollHandler);
-
   function reset_homework(){
       $("#homework_name").val("");
       $("#homework_end_time").val("<%= (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>");