diff --git a/e/js/common.js b/e/js/common.js index c6d4b06..b4fa4a3 100755 --- a/e/js/common.js +++ b/e/js/common.js @@ -1,16 +1,26 @@ -$(function(){ - $('.pagetop a').click(function () { - $('body, html').animate({ - scrollTop: 0 - }, 800); - return false; - }); +$(function() { + var body = $("html, body"); + + $(".pagetop a").on("click", function() { + var speed = 800; - $('a[href^=#]').click(function(){ - var speed = 500; - var href= $(this).attr("href"); - var target = $(href == "#" || href == "" ? 'html' : href); - var position = target.offset().top; $("html, body").animate({scrollTop:position}, speed, "swing"); - return false; - }); + body.animate({ + scrollTop: 0 + }, speed); + return false; + }); + + $("a[href^=#]").on("click", function() { + var speed = 500; + var href = $(this).attr("href"); + var target = $(href === "#" || href === "" ? "html" : href); + var position = target.offset().top; + + body.animate({ + scrollTop:position + }, speed, "swing"); + return false; + }); + + $(".slider").flexslider(); }); diff --git a/index.html b/index.html index 0c05918..99d859a 100755 --- a/index.html +++ b/index.html @@ -18,14 +18,9 @@ + - - @@ -332,4 +327,4 @@

OS X

- \ No newline at end of file + diff --git a/js/common.js b/js/common.js index c6d4b06..b4fa4a3 100755 --- a/js/common.js +++ b/js/common.js @@ -1,16 +1,26 @@ -$(function(){ - $('.pagetop a').click(function () { - $('body, html').animate({ - scrollTop: 0 - }, 800); - return false; - }); +$(function() { + var body = $("html, body"); + + $(".pagetop a").on("click", function() { + var speed = 800; - $('a[href^=#]').click(function(){ - var speed = 500; - var href= $(this).attr("href"); - var target = $(href == "#" || href == "" ? 'html' : href); - var position = target.offset().top; $("html, body").animate({scrollTop:position}, speed, "swing"); - return false; - }); + body.animate({ + scrollTop: 0 + }, speed); + return false; + }); + + $("a[href^=#]").on("click", function() { + var speed = 500; + var href = $(this).attr("href"); + var target = $(href === "#" || href === "" ? "html" : href); + var position = target.offset().top; + + body.animate({ + scrollTop:position + }, speed, "swing"); + return false; + }); + + $(".slider").flexslider(); });