Skip to content

Modify js code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+50 −35
Open

Modify js code #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions e/js/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
});
9 changes: 2 additions & 7 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,9 @@
<link rel="stylesheet" href="css/reset.css" />
<link rel="stylesheet" href="css/style.css" />
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="./js/jquery.flexslider.js"></script>
<script src="./js/common.js"></script>
<script src="./js/heightLine.js"></script>
<script src="./js/jquery.flexslider.js"></script>
<script>
$(window).load(function() {
$('.slider').flexslider();
});
</script>
</head>

<body>
Expand Down Expand Up @@ -332,4 +327,4 @@ <h2>OS X</h2>

</script>
</body>
</html>
</html>
38 changes: 24 additions & 14 deletions js/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
});