add animation of scroll

Gaohaoyang · Gaohaoyang · commit 9bc1c273cb3f · 2016-05-11T15:31:58.000+08:00
diff --git a/_includes/backToTop.html b/_includes/backToTop.html
@@ -1,5 +1,5 @@
 <div class="back-to-top">
-    <a href="#">
+    <a href="#top" class="scroll">
         <i class="fa fa-arrow-up" aria-hidden="true"></i>
     </a>
 </div>
diff --git a/_includes/header.html b/_includes/header.html
@@ -1,4 +1,4 @@
-<header>
+<header id="top">
     <div class="wrapper">
         <a href="{{ site.baseurl }}/" class="brand">{{ site.title }}</a>
         <small>{{site.brief-intro}}</small>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -12,6 +12,7 @@
     {% include footer.html %}
     {% include backToTop.html %}
     <script src="{{ " /js/main.js " | prepend: site.baseurl }}" charset="utf-8"></script>
+    <script src="{{ " /js/scroll.min.js " | prepend: site.baseurl }}" charset="utf-8"></script>
   </body>
 
 </html>
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -97,5 +97,4 @@ <h2 id="comments">Comments</h2>
     }
 }());
 </script>
-<script src="{{ "/js/scroll.min.js " | prepend: site.baseurl }}" charset="utf-8"></script>
 <script src="{{ "/js/pageContent.js " | prepend: site.baseurl }}" charset="utf-8"></script>
diff --git a/js/main.js b/js/main.js
@@ -32,16 +32,23 @@
 //////////////////////////back to top////////////////////////////
 (function() {
     var backToTop = document.querySelector('.back-to-top')
-    console.log(backToTop);
-    window.onscroll = function() {
+    var backToTopA = document.querySelector('.back-to-top a')
+        // console.log(backToTop);
+    window.addEventListener('scroll',function () {
+
 
         // 页面顶部滚进去的距离
         var scrollTop = Math.max(document.documentElement.scrollTop, document.body.scrollTop)
 
-        if (scrollTop>200) {
+        if (scrollTop > 200) {
             backToTop.classList.add('back-to-top-show')
-        }else{
+        } else {
             backToTop.classList.remove('back-to-top-show')
         }
-    }
+    })
+
+    // backToTopA.addEventListener('click',function (e) {
+    //     e.preventDefault()
+    //     window.scrollTo(0,0)
+    // })
 }());
diff --git a/page/0archives.html b/page/0archives.html
@@ -65,5 +65,4 @@ <h2 id="y{{ post.date | date: '%Y' }}">{{ post.date | date: '%Y' }}</h2>
         </div>
     </div>
 </div>
-<script src="{{ "/js/scroll.min.js " | prepend: site.baseurl }}" charset="utf-8"></script>
 <script src="{{ "/js/pageContent.js " | prepend: site.baseurl }}" charset="utf-8"></script>
diff --git a/page/1category.html b/page/1category.html
@@ -55,5 +55,4 @@ <h2 id="{{category | first}}">{{category | first}}</h2>
         </div>
     </div>
 </div>
-<script src="{{ "/js/scroll.min.js " | prepend: site.baseurl }}" charset="utf-8"></script>
 <script src="{{ "/js/pageContent.js " | prepend: site.baseurl }}" charset="utf-8"></script>
diff --git a/page/2tags.html b/page/2tags.html
@@ -59,5 +59,4 @@ <h2 id="{{ tag }}">{{ tag }}</h2>
         </div>
     </div>
 </div>
-<script src="{{ "/js/scroll.min.js " | prepend: site.baseurl }}" charset="utf-8"></script>
 <script src="{{ "/js/pageContent.js " | prepend: site.baseurl }}" charset="utf-8"></script>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<header>`
	`1`	`+<header id="top">`
`2`	`2`	`<div class="wrapper">`
`3`	`3`	`<a href="{{ site.baseurl }}/" class="brand">{{ site.title }}</a>`
`4`	`4`	`<small>{{site.brief-intro}}</small>`
Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,4 @@ <h2 id="comments">Comments</h2>`
`97`	`97`	`}`
`98`	`98`	`}());`
`99`	`99`	`</script>`
`100`		`-<script src="{{ "/js/scroll.min.js " \| prepend: site.baseurl }}" charset="utf-8"></script>`
`101`	`100`	`<script src="{{ "/js/pageContent.js " \| prepend: site.baseurl }}" charset="utf-8"></script>`