Skip to content

Commit 5c99999

Browse files
kswedbergkswedberg
committed
Update dependencies and fix a test
1 parent 6921aa0 commit 5c99999

File tree

4 files changed

+1985
-58
lines changed

4 files changed

+1985
-58
lines changed

‎package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@
2222
"jquery": ">=1.7.0"
2323
},
2424
"devDependencies": {
25-
"eslint-config-kswedberg": "^1.3.0",
25+
"eslint-config-kswedberg": "^5.1.1",
2626
"grunt": "^1.0.1",
27-
"grunt-contrib-concat": "^1.0.1",
28-
"grunt-contrib-jshint": "^1.1.0",
29-
"grunt-contrib-uglify": "^2.3.0",
27+
"grunt-contrib-concat": "^2.1.0",
28+
"grunt-contrib-jshint": "^3.2.0",
29+
"grunt-contrib-uglify": "^5.2.2",
3030
"grunt-contrib-watch": "^1.0.0",
31-
"grunt-eslint": "^19.0.0",
32-
"grunt-shell": "^2.1.0",
33-
"grunt-version": "^1.1.1",
31+
"grunt-eslint": "^24.0.0",
32+
"grunt-shell": "^4.0.0",
33+
"grunt-version": "^3.0.0",
3434
"lodash": "^4.17.4",
35-
"marked": "^0.3.6",
35+
"marked": "^4.0.19",
3636
"node-syntaxhighlighter": "^0.8.1",
37-
"qunitjs": "^1.20.0"
37+
"qunit": "^2.19.1"
3838
},
3939
"keywords": [
4040
"jQuery",

‎test/index.html

+176-48
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,180 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<title>Smooth Scroll Plugin Tests</title>
6-
<link rel="stylesheet" href="../node_modules/qunitjs/qunit/qunit.css">
7-
<style>
8-
p {
9-
margin: 0 auto;
10-
width: 200px;
11-
}
12-
#scrollable {
13-
border: 1px solid red;
14-
height: 200px;
15-
overflow: auto;
16-
}
17-
</style>
18-
</head>
19-
<body>
20-
<div id="qunit"></div>
21-
<div id="qunit-fixture">
22-
<a id="gotoone" href="#one">go to one</a>
23-
<button id="scrollit">scroll the scrollable</button>
24-
<div id="scrollable">
25-
<div style="height:100px;width:1px;">big block</div>
26-
<p id="findme">Sirloin frankfurter tongue pork, filet mignon drumstick shankle beef ribs tri-tip turducken hamburger salami andouille meatloaf. Andouille landjaeger flank boudin beef short ribs brisket alcatra kielbasa ham pork loin pancetta. Pancetta tenderloin shoulder, porchetta tri-tip pastrami ham pork loin tail swine andouille. Sausage landjaeger strip steak tail corned beef biltong meatball picanha beef ribs swine kielbasa. T-bone tail rump kevin doner chuck. Prosciutto andouille pork loin shankle t-bone, turducken sirloin landjaeger pancetta picanha spare ribs filet mignon. Shank ham beef chuck salami tail t-bone shoulder beef ribs kevin.</p>
27-
3+
<head>
4+
<meta charset="utf-8" />
5+
<title>Smooth Scroll Plugin Tests</title>
6+
<link rel="stylesheet" href="../node_modules/qunit/qunit/qunit.css" />
7+
<style>
8+
p {
9+
margin: 0 auto;
10+
width: 200px;
11+
}
12+
#scrollable {
13+
border: 1px solid red;
14+
height: 200px;
15+
overflow: auto;
16+
}
17+
</style>
18+
</head>
19+
<body>
20+
<div id="qunit"></div>
21+
<div id="qunit-fixture">
22+
<a id="gotoone" href="#one">go to one</a>
23+
<button id="scrollit">scroll the scrollable</button>
24+
<div id="scrollable">
25+
<div style="height: 100px; width: 1px">big block</div>
26+
<p id="findme">
27+
Sirloin frankfurter tongue pork, filet mignon drumstick shankle beef
28+
ribs tri-tip turducken hamburger salami andouille meatloaf. Andouille
29+
landjaeger flank boudin beef short ribs brisket alcatra kielbasa ham
30+
pork loin pancetta. Pancetta tenderloin shoulder, porchetta tri-tip
31+
pastrami ham pork loin tail swine andouille. Sausage landjaeger strip
32+
steak tail corned beef biltong meatball picanha beef ribs swine
33+
kielbasa. T-bone tail rump kevin doner chuck. Prosciutto andouille
34+
pork loin shankle t-bone, turducken sirloin landjaeger pancetta
35+
picanha spare ribs filet mignon. Shank ham beef chuck salami tail
36+
t-bone shoulder beef ribs kevin.
37+
</p>
38+
</div>
39+
<p>
40+
Bacon ipsum dolor amet andouille tri-tip salami frankfurter fatback
41+
venison. Cupim sausage rump boudin pork loin, salami kielbasa chuck jowl
42+
venison kevin prosciutto flank ribeye. Alcatra chuck sausage meatball
43+
beef ribs brisket biltong rump andouille tenderloin leberkas. Bacon
44+
andouille pork loin chuck shankle, ground round hamburger ham hock ball
45+
tip meatball sirloin drumstick flank kielbasa prosciutto.
46+
</p>
47+
<p>
48+
Hamburger pig sausage, pancetta rump turducken shankle landjaeger pork
49+
belly bresaola jerky brisket leberkas porchetta swine. Pork shankle
50+
salami, sausage ham cupim andouille. Sirloin sausage jerky, leberkas
51+
chuck short ribs pancetta t-bone kielbasa strip steak prosciutto salami
52+
beef ribs frankfurter. Brisket doner andouille t-bone prosciutto short
53+
loin. Kielbasa tenderloin doner beef ribs shankle.
54+
</p>
55+
<p>
56+
Kielbasa cupim boudin shank frankfurter. Short loin shank shankle
57+
sausage, salami pork loin leberkas biltong venison. Bresaola chuck
58+
chicken drumstick. Fatback cupim short ribs jerky brisket pancetta flank
59+
cow beef ribs salami capicola picanha rump short loin meatloaf. Corned
60+
beef meatloaf pork belly picanha alcatra pork chop.
61+
</p>
62+
<p>
63+
Sirloin frankfurter tongue pork, filet mignon drumstick shankle beef
64+
ribs tri-tip turducken hamburger salami andouille meatloaf. Andouille
65+
landjaeger flank boudin beef short ribs brisket alcatra kielbasa ham
66+
pork loin pancetta. Pancetta tenderloin shoulder, porchetta tri-tip
67+
pastrami ham pork loin tail swine andouille. Sausage landjaeger strip
68+
steak tail corned beef biltong meatball picanha beef ribs swine
69+
kielbasa. T-bone tail rump kevin doner chuck. Prosciutto andouille pork
70+
loin shankle t-bone, turducken sirloin landjaeger pancetta picanha spare
71+
ribs filet mignon. Shank ham beef chuck salami tail t-bone shoulder beef
72+
ribs kevin.
73+
</p>
74+
<p>
75+
Drumstick bacon turducken boudin ribeye cupim. Flank bresaola porchetta
76+
hamburger capicola. Sirloin tenderloin jowl, corned beef t-bone meatloaf
77+
swine pig. Swine ham hock beef ribs pork, strip steak rump picanha tail
78+
kielbasa turducken shank flank short loin chuck.
79+
</p>
80+
<p>
81+
Prosciutto meatloaf t-bone shankle biltong, spare ribs pork belly pork
82+
cupim. Brisket pork loin kevin short loin cupim chuck jerky sirloin
83+
t-bone pig. Doner bresaola boudin beef frankfurter jowl t-bone ham hock
84+
strip steak turducken jerky leberkas alcatra flank shoulder. Tenderloin
85+
cupim hamburger, cow shoulder capicola jowl shankle swine pork loin
86+
meatloaf. Biltong drumstick meatloaf, cow pork belly ham hock pancetta
87+
alcatra landjaeger leberkas ball tip salami hamburger turkey.
88+
</p>
89+
<p>
90+
Chuck kielbasa shoulder fatback venison pastrami, sausage rump cupim
91+
sirloin ham hock tail. Kevin prosciutto capicola brisket beef ribs
92+
chicken andouille. Spare ribs meatball kielbasa ribeye pork belly turkey
93+
ham. Ham hock beef ribs hamburger, bresaola pork biltong landjaeger.
94+
Ball tip picanha short ribs andouille chicken. Cow spare ribs bresaola
95+
tongue, ribeye hamburger biltong shank filet mignon drumstick brisket
96+
capicola rump short loin. Ham hock bacon sirloin kielbasa sausage doner
97+
shoulder.
98+
</p>
99+
<p>
100+
Kielbasa cow tail pork, salami jowl leberkas kevin rump swine jerky.
101+
Strip steak turducken flank, jowl andouille bacon meatloaf venison
102+
alcatra short ribs prosciutto ribeye. Corned beef short loin leberkas
103+
tenderloin bresaola sausage pancetta frankfurter bacon. Turducken kevin
104+
landjaeger, corned beef bresaola picanha chuck. Ground round shoulder
105+
picanha pancetta, fatback shankle pork loin pastrami tri-tip.
106+
</p>
107+
<p>
108+
Ribeye ham sirloin, ham hock short ribs flank ground round landjaeger
109+
brisket. Chicken prosciutto salami, bresaola capicola jowl ham hock
110+
filet mignon pork spare ribs doner biltong. Ball tip hamburger tongue,
111+
porchetta short loin meatball pork bresaola meatloaf fatback. Ham
112+
sausage ground round tongue pancetta beef ribs. Jerky cow tri-tip shank,
113+
tenderloin drumstick tongue ball tip strip steak leberkas pig. Sausage
114+
pork chop alcatra, boudin ground round picanha bresaola doner pancetta
115+
cow. Porchetta salami short ribs, drumstick ground round shank leberkas
116+
tail rump bacon andouille tenderloin sausage meatloaf chicken.
117+
</p>
118+
<p>
119+
Salami tongue picanha, cupim cow ground round bacon turducken fatback
120+
meatloaf landjaeger leberkas kevin. Ground round kielbasa swine pork
121+
loin kevin ball tip. Shankle beef ribs venison biltong turkey, strip
122+
steak short ribs fatback kielbasa tenderloin pastrami ham hock ham.
123+
Salami bacon tail tongue pancetta cupim pastrami pork chop prosciutto
124+
brisket beef ribs. Swine salami ball tip tongue, turducken sausage pork
125+
belly frankfurter picanha capicola andouille meatloaf biltong short ribs
126+
hamburger. Shankle meatloaf tenderloin meatball, boudin ground round
127+
andouille cupim short loin filet mignon capicola. Boudin bresaola spare
128+
ribs meatloaf, alcatra bacon pork loin frankfurter prosciutto meatball
129+
pork belly salami.
130+
</p>
131+
<p>
132+
Corned beef doner flank kevin. Alcatra ham hock kielbasa, pork loin
133+
turkey landjaeger bresaola shankle t-bone rump flank tenderloin beef.
134+
Meatball shank turducken leberkas t-bone. Ground round beef swine rump
135+
porchetta pork chop tri-tip pork loin kielbasa pastrami frankfurter pork
136+
andouille.
137+
</p>
138+
<p>
139+
Turkey chicken tongue boudin cupim flank porchetta pastrami. Cow ham
140+
alcatra, porchetta turkey doner t-bone ribeye brisket spare ribs short
141+
ribs kielbasa. Ribeye ground round tenderloin beef ribs. Pancetta
142+
capicola porchetta ball tip doner drumstick boudin t-bone shankle.
143+
Pancetta flank leberkas, chicken tri-tip porchetta drumstick tail ribeye
144+
venison. Landjaeger alcatra turkey, picanha porchetta beef frankfurter
145+
meatball bacon pig short loin.
146+
</p>
147+
<p id="one">
148+
Filet mignon beef corned beef biltong doner, kielbasa prosciutto venison
149+
tenderloin. Shoulder bresaola t-bone pig tenderloin, meatball spare ribs
150+
leberkas tongue drumstick picanha rump ground round. Tongue short ribs
151+
pig salami rump, boudin andouille hamburger pancetta meatball. Filet
152+
mignon capicola pancetta cupim, shank jerky ham hock pork spare ribs
153+
strip steak short ribs rump alcatra. Shoulder short ribs picanha,
154+
chicken beef ham pork chop leberkas pastrami bresaola meatball salami.
155+
Salami pork chop ham hock pork meatloaf kielbasa turkey ribeye chicken
156+
tenderloin hamburger boudin frankfurter. Tri-tip hamburger short ribs
157+
short loin ham ball tip shoulder landjaeger tongue pig.
158+
</p>
159+
<p>
160+
Flank pastrami sausage jerky cupim. Corned beef shankle boudin pancetta
161+
salami short ribs. Frankfurter beef ribs ribeye corned beef pastrami
162+
landjaeger flank meatloaf pork chop. Prosciutto pig frankfurter leberkas
163+
ham hock. Cupim flank tenderloin shank porchetta tail.
164+
</p>
165+
<p>
166+
Bresaola beef ribs beef, tongue picanha sirloin short loin biltong.
167+
Short ribs leberkas jerky beef ribs tongue bacon pork chop. Meatloaf
168+
shankle short loin, jerky cupim chuck ground round biltong ham cow
169+
tenderloin. Sausage pancetta ribeye, venison doner landjaeger kielbasa
170+
bresaola. Leberkas tail andouille jowl spare ribs pork frankfurter pork
171+
belly salami sausage t-bone rump tongue. Flank chuck pork chop short
172+
ribs ball tip ham hock jerky shankle beef kielbasa prosciutto salami.
173+
</p>
28174
</div>
29-
<p>Bacon ipsum dolor amet andouille tri-tip salami frankfurter fatback venison. Cupim sausage rump boudin pork loin, salami kielbasa chuck jowl venison kevin prosciutto flank ribeye. Alcatra chuck sausage meatball beef ribs brisket biltong rump andouille tenderloin leberkas. Bacon andouille pork loin chuck shankle, ground round hamburger ham hock ball tip meatball sirloin drumstick flank kielbasa prosciutto.</p>
30-
<p>Hamburger pig sausage, pancetta rump turducken shankle landjaeger pork belly bresaola jerky brisket leberkas porchetta swine. Pork shankle salami, sausage ham cupim andouille. Sirloin sausage jerky, leberkas chuck short ribs pancetta t-bone kielbasa strip steak prosciutto salami beef ribs frankfurter. Brisket doner andouille t-bone prosciutto short loin. Kielbasa tenderloin doner beef ribs shankle.</p>
31-
<p>Kielbasa cupim boudin shank frankfurter. Short loin shank shankle sausage, salami pork loin leberkas biltong venison. Bresaola chuck chicken drumstick. Fatback cupim short ribs jerky brisket pancetta flank cow beef ribs salami capicola picanha rump short loin meatloaf. Corned beef meatloaf pork belly picanha alcatra pork chop.</p>
32-
<p>Sirloin frankfurter tongue pork, filet mignon drumstick shankle beef ribs tri-tip turducken hamburger salami andouille meatloaf. Andouille landjaeger flank boudin beef short ribs brisket alcatra kielbasa ham pork loin pancetta. Pancetta tenderloin shoulder, porchetta tri-tip pastrami ham pork loin tail swine andouille. Sausage landjaeger strip steak tail corned beef biltong meatball picanha beef ribs swine kielbasa. T-bone tail rump kevin doner chuck. Prosciutto andouille pork loin shankle t-bone, turducken sirloin landjaeger pancetta picanha spare ribs filet mignon. Shank ham beef chuck salami tail t-bone shoulder beef ribs kevin.</p>
33-
<p>Drumstick bacon turducken boudin ribeye cupim. Flank bresaola porchetta hamburger capicola. Sirloin tenderloin jowl, corned beef t-bone meatloaf swine pig. Swine ham hock beef ribs pork, strip steak rump picanha tail kielbasa turducken shank flank short loin chuck.</p>
34-
<p>Prosciutto meatloaf t-bone shankle biltong, spare ribs pork belly pork cupim. Brisket pork loin kevin short loin cupim chuck jerky sirloin t-bone pig. Doner bresaola boudin beef frankfurter jowl t-bone ham hock strip steak turducken jerky leberkas alcatra flank shoulder. Tenderloin cupim hamburger, cow shoulder capicola jowl shankle swine pork loin meatloaf. Biltong drumstick meatloaf, cow pork belly ham hock pancetta alcatra landjaeger leberkas ball tip salami hamburger turkey.</p>
35-
<p>Chuck kielbasa shoulder fatback venison pastrami, sausage rump cupim sirloin ham hock tail. Kevin prosciutto capicola brisket beef ribs chicken andouille. Spare ribs meatball kielbasa ribeye pork belly turkey ham. Ham hock beef ribs hamburger, bresaola pork biltong landjaeger. Ball tip picanha short ribs andouille chicken. Cow spare ribs bresaola tongue, ribeye hamburger biltong shank filet mignon drumstick brisket capicola rump short loin. Ham hock bacon sirloin kielbasa sausage doner shoulder.</p>
36-
<p>Kielbasa cow tail pork, salami jowl leberkas kevin rump swine jerky. Strip steak turducken flank, jowl andouille bacon meatloaf venison alcatra short ribs prosciutto ribeye. Corned beef short loin leberkas tenderloin bresaola sausage pancetta frankfurter bacon. Turducken kevin landjaeger, corned beef bresaola picanha chuck. Ground round shoulder picanha pancetta, fatback shankle pork loin pastrami tri-tip.</p>
37-
<p>Ribeye ham sirloin, ham hock short ribs flank ground round landjaeger brisket. Chicken prosciutto salami, bresaola capicola jowl ham hock filet mignon pork spare ribs doner biltong. Ball tip hamburger tongue, porchetta short loin meatball pork bresaola meatloaf fatback. Ham sausage ground round tongue pancetta beef ribs. Jerky cow tri-tip shank, tenderloin drumstick tongue ball tip strip steak leberkas pig. Sausage pork chop alcatra, boudin ground round picanha bresaola doner pancetta cow. Porchetta salami short ribs, drumstick ground round shank leberkas tail rump bacon andouille tenderloin sausage meatloaf chicken.</p>
38-
<p>Salami tongue picanha, cupim cow ground round bacon turducken fatback meatloaf landjaeger leberkas kevin. Ground round kielbasa swine pork loin kevin ball tip. Shankle beef ribs venison biltong turkey, strip steak short ribs fatback kielbasa tenderloin pastrami ham hock ham. Salami bacon tail tongue pancetta cupim pastrami pork chop prosciutto brisket beef ribs. Swine salami ball tip tongue, turducken sausage pork belly frankfurter picanha capicola andouille meatloaf biltong short ribs hamburger. Shankle meatloaf tenderloin meatball, boudin ground round andouille cupim short loin filet mignon capicola. Boudin bresaola spare ribs meatloaf, alcatra bacon pork loin frankfurter prosciutto meatball pork belly salami.</p>
39-
<p>Corned beef doner flank kevin. Alcatra ham hock kielbasa, pork loin turkey landjaeger bresaola shankle t-bone rump flank tenderloin beef. Meatball shank turducken leberkas t-bone. Ground round beef swine rump porchetta pork chop tri-tip pork loin kielbasa pastrami frankfurter pork andouille.</p>
40-
<p>Turkey chicken tongue boudin cupim flank porchetta pastrami. Cow ham alcatra, porchetta turkey doner t-bone ribeye brisket spare ribs short ribs kielbasa. Ribeye ground round tenderloin beef ribs. Pancetta capicola porchetta ball tip doner drumstick boudin t-bone shankle. Pancetta flank leberkas, chicken tri-tip porchetta drumstick tail ribeye venison. Landjaeger alcatra turkey, picanha porchetta beef frankfurter meatball bacon pig short loin.</p>
41-
<p id="one">Filet mignon beef corned beef biltong doner, kielbasa prosciutto venison tenderloin. Shoulder bresaola t-bone pig tenderloin, meatball spare ribs leberkas tongue drumstick picanha rump ground round. Tongue short ribs pig salami rump, boudin andouille hamburger pancetta meatball. Filet mignon capicola pancetta cupim, shank jerky ham hock pork spare ribs strip steak short ribs rump alcatra. Shoulder short ribs picanha, chicken beef ham pork chop leberkas pastrami bresaola meatball salami. Salami pork chop ham hock pork meatloaf kielbasa turkey ribeye chicken tenderloin hamburger boudin frankfurter. Tri-tip hamburger short ribs short loin ham ball tip shoulder landjaeger tongue pig.</p>
42-
<p>Flank pastrami sausage jerky cupim. Corned beef shankle boudin pancetta salami short ribs. Frankfurter beef ribs ribeye corned beef pastrami landjaeger flank meatloaf pork chop. Prosciutto pig frankfurter leberkas ham hock. Cupim flank tenderloin shank porchetta tail.</p>
43-
<p>Bresaola beef ribs beef, tongue picanha sirloin short loin biltong. Short ribs leberkas jerky beef ribs tongue bacon pork chop. Meatloaf shankle short loin, jerky cupim chuck ground round biltong ham cow tenderloin. Sausage pancetta ribeye, venison doner landjaeger kielbasa bresaola. Leberkas tail andouille jowl spare ribs pork frankfurter pork belly salami sausage t-bone rump tongue. Flank chuck pork chop short ribs ball tip ham hock jerky shankle beef kielbasa prosciutto salami.</p>
44-
45-
46-
</div>
47-
<script src="../lib/jquery/jquery.js"></script>
48-
<script src="../src/jquery.smooth-scroll.js"></script>
49-
<script src="../node_modules/qunitjs/qunit/qunit.js"></script>
50-
<script src="tests.js"></script>
51-
</body>
175+
<script src="../lib/jquery/jquery.js"></script>
176+
<script src="../src/jquery.smooth-scroll.js"></script>
177+
<script src="../node_modules/qunit/qunit/qunit.js"></script>
178+
<script src="tests.js"></script>
179+
</body>
52180
</html>

‎test/tests.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ QUnit.module('scrollable');
1414

1515
QUnit.test('Returns first scrollable element (html,body)', function(assert) {
1616
var scrollable = $('html,body').firstScrollable();
17+
var scrollingElement = document.scrollingElement || document.body;
1718

1819
assert.equal(scrollable.length, 1, 'One scrollable element is returned');
19-
assert.equal(scrollable[0], document.body, 'Scrollable element is <body>');
20+
assert.equal(scrollable[0], scrollingElement, 'Scrollable element matches document.scrollingElement or <body>');
2021
});
2122

2223
QUnit.test('Returns scrollable element (div#scrollable)', function(assert) {

0 commit comments

Comments
 (0)