Skip to content

Commit 1e58e17

Browse files
bertiquebertique
committed
Update jquery, remove SmoothScroll, fix some audit issues
1 parent 790833e commit 1e58e17

File tree

5 files changed

+28
-50
lines changed

5 files changed

+28
-50
lines changed

‎_includes/header.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
99
<span class="icon icon-list" style="font-size:30px; color:#3498db;"></span>
1010
</button>
11-
<a class="navbar-brand hidden-xs hidden-sm smoothScroll" href="{{ "/#home" | prepend: site.baseurl }}"><strong>Michael Dick</strong></a>
11+
<a class="navbar-brand hidden-xs hidden-sm" href="{{ "/#home" | prepend: site.baseurl }}"><strong>Michael Dick</strong></a>
1212
</div>
1313
<div class="navbar-collapse collapse">
1414
<ul class="nav navbar-nav">
15-
<li><a href="{{ "/#greywrap" | prepend: site.baseurl }}" class="smoothScroll">Home</a></li>
16-
<li><a href="{{ "/#projects" | prepend: site.baseurl }}" class="smoothScroll">Projects</a></li>
17-
{% if site.posts != empty %}<li><a href="{{ "/#blog" | prepend: site.baseurl }}" class="smoothScroll">Blog</a></li> {% endif %}
15+
<li><a href="{% if page.url == '/' %}{{ "#greywrap" | prepend: site.baseurl }}{% else %}{{ "/#greywrap" | prepend: site.baseurl }}{% endif %}">Home</a></li>
16+
<li><a href="{% if page.url == '/' %}{{ "#projects" | prepend: site.baseurl }}{% else %}{{ "/#projects" | prepend: site.baseurl }}{% endif %}">Projects</a></li>
17+
{% if site.posts != empty %}<li><a href="{% if page.url == '/' %}{{ "#blog" | prepend: site.baseurl }}{% else %}{{ "/#blog" | prepend: site.baseurl }}{% endif %}">Blog</a></li> {% endif %}
1818
</ul>
1919
</div><!--/.nav-collapse -->
2020
</div>

‎_layouts/default.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33

44
{% include head.html %}
55

‎index.html

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
---
44
<!-- ==== HEADERWRAP ==== -->
5-
<a href="#greywrap" class="smoothScroll"><div id="home" name="home">
5+
<a href="#greywrap"><div id="home" name="home">
66
<header class="clearfix">
77

88
</header>
@@ -12,7 +12,7 @@
1212
<div id="greywrap">
1313
<div class="container">
1414
<div class="row">
15-
<a href="#greywrap" class="glyphicon glyphicon-chevron-down smoothScroll"></a>
15+
<a href="#greywrap" class="glyphicon glyphicon-chevron-down"></a>
1616
<br>
1717
<br>
1818
</div><!-- /row -->
@@ -21,13 +21,13 @@
2121
<div class="col-lg-4">
2222
<h2>Hi,</h2>
2323
<p>I'm Michael. I love creating things - software, music, art. Check <a href="https://twitter.com/{{ site.twitter_username }}">my Twitter</a> to see what I'm up to. </p>
24-
<p><a href="mailto:{{ site.email }}" target="_blank" class="icon icon-mail"></a>
25-
<a href="https://linkedin.com/{{ site.linkedin_username }}" target="_blank" class="icon icon-linkedin2"></a>
26-
<a href="https://github.com/{{ site.github_username }}" target="_blank" class="icon icon-github"></a>
27-
<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" class="icon icon-twitter2"></a></p>
24+
<p><a href="mailto:{{ site.email }}" target="_blank" rel="noopener" class="icon icon-mail"></a>
25+
<a href="https://linkedin.com/{{ site.linkedin_username }}" target="_blank" rel="noopener" class="icon icon-linkedin2"></a>
26+
<a href="https://github.com/{{ site.github_username }}" target="_blank" rel="noopener" class="icon icon-github"></a>
27+
<a href="https://twitter.com/{{ site.twitter_username }}" target="_blank" rel="noopener" class="icon icon-twitter2"></a></p>
2828
</div>
2929
<div class="col-lg-8 centered">
30-
<img class="img-responsive" src="{{ "/img/macbook.png" | prepend: site.baseurl }}" align="">
30+
<img class="img-responsive" src="{{ "/img/macbook.png" | prepend: site.baseurl }}" alt="Macbook" align="">
3131
</div>
3232
</div><!-- row -->
3333
</div>
@@ -41,7 +41,7 @@ <h2>Hi,</h2>
4141
<br>
4242
<div class="row">
4343
<br>
44-
<a href="#projects" class="smoothScroll"><h1 class="centered">SIDE PROJECTS</h1></a>
44+
<a href="#projects"><h1 class="centered">SIDE PROJECTS</h1></a>
4545
<hr>
4646
<br>
4747
<br>
@@ -107,7 +107,7 @@ <h4 class="modal-title">{{ page.title }}</h4>
107107
<br>
108108
<div class="row">
109109
<br>
110-
<a href="#blog" class="smoothScroll"><h1 class="centered">RANDOM THOUGHTS</h1></a>
110+
<a href="#blog"><h1 class="centered">RANDOM THOUGHTS</h1></a>
111111
<hr>
112112
<br>
113113
<br>
@@ -116,7 +116,7 @@ <h4 class="modal-title">{{ page.title }}</h4>
116116
<div class="col-lg-12 blog-bg">
117117
<div class="col-lg-3 centered">
118118
<br>
119-
<p><img class="img img-circle" src="{{ "/img/profile.jpg" | prepend: site.baseurl }}" width="120px" height="120px"></p>
119+
<p><img class="img img-circle" src="{{ "/img/profile.jpg" | prepend: site.baseurl }}" alt="Profile image" width="120px" height="120px"></p>
120120
<h4>Michael</h4>
121121
<a href="https://twitter.com/{{ site.twitter_username }}" class="icon icon-twitter"></a>
122122
</div>

‎js/jquery.min.js

+5-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/smoothscroll.js

+8-31
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,10 @@
1-
/**
2-
* SmoothScroll
3-
* This helper script created by DWUser.com. Copyright 2013 DWUser.com.
4-
* Dual-licensed under the GPL and MIT licenses.
5-
* All individual scripts remain property of their copyrighters.
6-
* Date: 10-Sep-2013
7-
* Version: 1.0.1
8-
*/
9-
if (!window['jQuery']) alert('The jQuery library must be included before the smoothscroll.js file. The plugin will not work propery.');
1+
// Taken from https://stackoverflow.com/questions/7717527/smooth-scrolling-when-clicking-an-anchor-link
2+
var $root = $('html, body');
103

11-
/**
12-
* jQuery.ScrollTo - Easy element scrolling using jQuery.
13-
* Copyright (c) 2007-2013 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
14-
* Dual licensed under MIT and GPL.
15-
* @author Ariel Flesler
16-
* @version 1.4.3.1
17-
*/
18-
;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){if(e==null)return;var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
4+
$('a[href^="#"]').click(function () {
5+
$root.animate({
6+
scrollTop: $( $.attr(this, 'href') ).offset().top
7+
}, 500);
198

20-
/**
21-
* jQuery.LocalScroll
22-
* Copyright (c) 2007-2010 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
23-
* Dual licensed under MIT and GPL.
24-
* Date: 05/31/2010
25-
* @author Ariel Flesler
26-
* @version 1.2.8b
27-
**/
28-
;(function(b){function g(a,e,d){var h=e.hash.slice(1),f=document.getElementById(h)||document.getElementsByName(h)[0];if(f){a&&a.preventDefault();var c=b(d.target);if(!(d.lock&&c.is(":animated")||d.onBefore&&!1===d.onBefore(a,f,c))){d.stop&&c._scrollable().stop(!0);if(d.hash){var a=f.id==h?"id":"name",g=b("<a> </a>").attr(a,h).css({position:"absolute",top:b(window).scrollTop(),left:b(window).scrollLeft()});f[a]="";b("body").prepend(g);location=e.hash;g.remove();f[a]=h}c.scrollTo(f,d).trigger("notify.serialScroll",
29-
[f])}}}var i=location.href.replace(/#.*/,""),c=b.localScroll=function(a){b("body").localScroll(a)};c.defaults={duration:1E3,axis:"y",event:"click",stop:!0,target:window,reset:!0};c.hash=function(a){if(location.hash){a=b.extend({},c.defaults,a);a.hash=!1;if(a.reset){var e=a.duration;delete a.duration;b(a.target).scrollTo(0,a);a.duration=e}g(0,location,a)}};b.fn.localScroll=function(a){function e(){return!!this.href&&!!this.hash&&this.href.replace(this.hash,"")==i&&(!a.filter||b(this).is(a.filter))}
30-
a=b.extend({},c.defaults,a);return a.lazy?this.bind(a.event,function(d){var c=b([d.target,d.target.parentNode]).filter(e)[0];c&&g(d,c,a)}):this.find("a,area").filter(e).bind(a.event,function(b){g(b,this,a)}).end().end()}})(jQuery);
31-
32-
// Initialize all .smoothScroll links
33-
jQuery(function($){ $.localScroll({filter:'.smoothScroll'}); });
9+
return false;
10+
});

0 commit comments

Comments
 (0)