update letter

zhaohaibo123 · Mar 17, 2017 · b314f87 · b314f87
1 parent 8243f2d
commit b314f87
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 33 deletions.
diff --git a/src/main/resources/static/js/letter.js b/src/main/resources/static/js/letter.js
@@ -1,21 +1,4 @@
 var page = 1;
-$(function(){
-    reload();
-    var loadingFlag = true;
-    $(window).scroll(function(){
-        if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-            if($("#letter").length >= 1){
-                if(loadingFlag){
-                    loadingFlag = false;
-                    $('#loadingStandard').show();
-                    loadMore();
-                    $('#loadingStandard').hide();
-                    loadingFlag = true;
-                }
-            }
-        }
-    });
-});
 
 function loadMore(){
     $.ajax({
@@ -31,6 +14,9 @@ function loadMore(){
         },
         success: function(letters){
             listLetter(letters);
+            if(letters.length > 0){
+                reload();
+            }
             page++;
         }
     });
@@ -88,7 +74,6 @@ function listLetter(letters){
         letterList = letterList + item;
     }
     $("#letterList").append(letterList);
-    reload();
 }
 
 // 发送私信
@@ -141,17 +126,3 @@ function sendLetter(type,pid,obj){
     });
 }
 
-function reload(){
-    $(".timeline li").each(function(){
-        var _this = $(this);
-        _this.find(".table-grid .btn").click(function(){
-            if(_this.find(".collapse").hasClass('in')){
-                _this.find(".collapse").removeClass('in')
-            }else{
-                _this.find(".collapse").addClass('in')
-                var rep = "@"+_this.find(".m0 .text-muted .send-user-name").html()+" ";
-                _this.find(".form-control").focus().val(rep);
-            }
-        });
-    });
-}
diff --git a/src/main/resources/templates/notice/letterme.html b/src/main/resources/templates/notice/letterme.html
@@ -42,7 +42,7 @@ <h3>私信我的</h3>
                                              <div class="input-group">
                                                 <input type="text" class="form-control" required="required" placeholder="输入回复..." />
                                                 <span class="input-group-btn">
-                                                   <button type="submit" th:onclick="'sendLetter(\'reply\',\''+${letter.id}+'\',this);'" class="btn btn-default" th:value="${letter.id}">发送</button>
+                                                   <button type="submit" th:onclick="'sendLetter(\'reply\',\''+${letter.id}+'\',this);'" class="btn btn-default" >发送</button>
                                                 </span>
                                              </div>
                                           </form>
@@ -61,4 +61,37 @@ <h3>私信我的</h3>
          </div>
       </section>
 </body>
+<script type='text/javascript' th:inline="javascript">
+   $(function(){
+      reload();
+      var loadingFlag = true;
+      $(window).scroll(function(){
+         if ($(window).scrollTop() == $(document).height() - $(window).height()) {
+            if($("#letter").length >= 1){
+               if(loadingFlag){
+                  loadingFlag = false;
+                  $('#loadingStandard').show();
+                  loadMore();
+                  $('#loadingStandard').hide();
+                  loadingFlag = true;
+               }
+            }
+         }
+      });
+   });
+   function reload(){
+      $(".timeline li").each(function(){
+         var _this = $(this);
+         _this.find(".table-grid .btn").click(function(){
+            if(_this.find(".collapse").hasClass('in')){
+               _this.find(".collapse").removeClass('in')
+            }else{
+               _this.find(".collapse").addClass('in')
+               var rep = "@"+_this.find(".m0 .text-muted .send-user-name").html()+" ";
+               _this.find(".form-control").focus().val(rep);
+            }
+         });
+      });
+   }
+</script>
 </html>