Skip to content
This repository was archived by the owner on Nov 10, 2020. It is now read-only.

Commit 1ae5328

Browse files
meiqimichellemeiqimichelle
authored
Merge pull request #2129 from 18F/lag-issues
Address Chrome lag issues
2 parents 42b2cf5 + c0f0191 commit 1ae5328

File tree

5 files changed

+74
-47
lines changed

5 files changed

+74
-47
lines changed

‎_how-it-works/aml-fees.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ For more information:
6060

6161
<img src="{{ site.baseurl }}/img/AML_disbursements.svg" alt="Chart shows the amount of total funds in the AML reclamation program in 2016, 10.7 billion. 8.2 billion of that total has been disbursed. 2.5 billion of that total has not been disbursed." class="article_img-100 u-margin-top u-margin-bottom">
6262

63-
The AML database ([e-AMLIS](https://amlis.osmre.gov/Default.aspx)) only accounts for construction costs. It doesn't include other work on which a state or tribe may spend AML funds that are necessary for the reclamation of a site, such as the costs of identification, site assessments, and contracting, nor does it include other types of spending, such as set-asides and emergency projects ([30 U.S. Code § 1231 describes other types of spending](https://www.law.cornell.edu/uscode/text/30/1231)).
63+
The AML database ([e-AMLIS](https://amlis.osmre.gov/Default.aspx)) only accounts for construction costs. It doesn't include other work on which a state or tribe may spend AML funds that are necessary for the reclamation of a site, such as the costs of identification, site assessments, and contracting, nor does it include other types of spending, such as set-asides and emergency projects ([30 U.S. Code § 1231 describes other types of spending](https://www.law.cornell.edu/uscode/text/30/1231)).
6464

6565
## AML revenue and disbursements
6666

‎js/lib/explore.min.js

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,28 @@
117117

118118
/*!
119119
* Stickyfill -- `position: sticky` polyfill
120-
* v. 1.1.1 | https://github.com/wilddeer/stickyfill
120+
* v. 1.1.9 | https://github.com/wilddeer/stickyfill
121121
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
122122
*
123123
* MIT License
124124
*/
125-
126-
module.exports = (function(doc, win) {
125+
/*!
126+
* Stickyfill -- `position: sticky` polyfill
127+
* v. 1.1.4 | https://github.com/wilddeer/stickyfill
128+
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
129+
*
130+
* MIT License
131+
*/
132+
133+
module.exports = (function(doc, win) {
127134
if (!doc) {
128135
doc = document;
129136
}
130137

131138
if (!win) {
132139
win = window;
133140
}
134-
141+
135142
var watchArray = [],
136143
scroll,
137144
initialized = false,
@@ -176,7 +183,7 @@
176183
}
177184

178185
function mergeObjects(targetObj, sourceObject) {
179-
for (key in sourceObject) {
186+
for (var key in sourceObject) {
180187
if (sourceObject.hasOwnProperty(key)) {
181188
targetObj[key] = sourceObject[key];
182189
}
@@ -200,7 +207,7 @@
200207
rebuild();
201208
return;
202209
}
203-
210+
204211
if (win.pageYOffset != scroll.top) {
205212
updateScrollPos();
206213
recalcAllPos();
@@ -247,7 +254,7 @@
247254
}
248255

249256
function initElement(el) {
250-
if (isNaN(parseFloat(el.computed.top)) || el.isCell) return;
257+
if (isNaN(parseFloat(el.computed.top)) || el.isCell || el.computed.display == 'none') return;
251258

252259
el.inited = true;
253260

@@ -373,7 +380,8 @@
373380
marginBottom: computedStyle.marginBottom,
374381
marginLeft: computedStyle.marginLeft,
375382
marginRight: computedStyle.marginRight,
376-
cssFloat: computedStyle.cssFloat
383+
cssFloat: computedStyle.cssFloat,
384+
display: computedStyle.display
377385
},
378386
numeric = {
379387
top: parseNumeric(computedStyle.top),
@@ -399,7 +407,7 @@
399407
},
400408
nodeOffset = getElementOffset(node),
401409
parentOffset = getElementOffset(parentNode),
402-
410+
403411
parent = {
404412
node: parentNode,
405413
css: {
@@ -496,8 +504,8 @@
496504
updateScrollPos();
497505
initAll();
498506

499-
win.addEventListener('scroll', onScroll);
500-
win.addEventListener('wheel', onWheel);
507+
win.addEventListener('scroll', onScroll, { passive: true });
508+
win.addEventListener('wheel', onWheel, { passive: true });
501509

502510
//watch for width changes
503511
win.addEventListener('resize', rebuild);
@@ -515,11 +523,11 @@
515523
if (!initialized) return;
516524

517525
deinitAll();
518-
526+
519527
for (var i = watchArray.length - 1; i >= 0; i--) {
520528
watchArray[i] = getElementParams(watchArray[i].node);
521529
}
522-
530+
523531
initAll();
524532
}
525533

@@ -537,7 +545,7 @@
537545

538546
function stop() {
539547
pause();
540-
deinitAll();
548+
deinitAll();
541549
}
542550

543551
function kill() {
@@ -588,7 +596,8 @@
588596
stop: stop,
589597
kill: kill
590598
};
591-
})
599+
});
600+
592601

593602
/***/ },
594603
/* 5 */

‎js/lib/narrative.min.js

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,21 +121,28 @@
121121

122122
/*!
123123
* Stickyfill -- `position: sticky` polyfill
124-
* v. 1.1.1 | https://github.com/wilddeer/stickyfill
124+
* v. 1.1.9 | https://github.com/wilddeer/stickyfill
125125
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
126126
*
127127
* MIT License
128128
*/
129-
130-
module.exports = (function(doc, win) {
129+
/*!
130+
* Stickyfill -- `position: sticky` polyfill
131+
* v. 1.1.4 | https://github.com/wilddeer/stickyfill
132+
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
133+
*
134+
* MIT License
135+
*/
136+
137+
module.exports = (function(doc, win) {
131138
if (!doc) {
132139
doc = document;
133140
}
134141

135142
if (!win) {
136143
win = window;
137144
}
138-
145+
139146
var watchArray = [],
140147
scroll,
141148
initialized = false,
@@ -180,7 +187,7 @@
180187
}
181188

182189
function mergeObjects(targetObj, sourceObject) {
183-
for (key in sourceObject) {
190+
for (var key in sourceObject) {
184191
if (sourceObject.hasOwnProperty(key)) {
185192
targetObj[key] = sourceObject[key];
186193
}
@@ -204,7 +211,7 @@
204211
rebuild();
205212
return;
206213
}
207-
214+
208215
if (win.pageYOffset != scroll.top) {
209216
updateScrollPos();
210217
recalcAllPos();
@@ -251,7 +258,7 @@
251258
}
252259

253260
function initElement(el) {
254-
if (isNaN(parseFloat(el.computed.top)) || el.isCell) return;
261+
if (isNaN(parseFloat(el.computed.top)) || el.isCell || el.computed.display == 'none') return;
255262

256263
el.inited = true;
257264

@@ -377,7 +384,8 @@
377384
marginBottom: computedStyle.marginBottom,
378385
marginLeft: computedStyle.marginLeft,
379386
marginRight: computedStyle.marginRight,
380-
cssFloat: computedStyle.cssFloat
387+
cssFloat: computedStyle.cssFloat,
388+
display: computedStyle.display
381389
},
382390
numeric = {
383391
top: parseNumeric(computedStyle.top),
@@ -403,7 +411,7 @@
403411
},
404412
nodeOffset = getElementOffset(node),
405413
parentOffset = getElementOffset(parentNode),
406-
414+
407415
parent = {
408416
node: parentNode,
409417
css: {
@@ -500,8 +508,8 @@
500508
updateScrollPos();
501509
initAll();
502510

503-
win.addEventListener('scroll', onScroll);
504-
win.addEventListener('wheel', onWheel);
511+
win.addEventListener('scroll', onScroll, { passive: true });
512+
win.addEventListener('wheel', onWheel, { passive: true });
505513

506514
//watch for width changes
507515
win.addEventListener('resize', rebuild);
@@ -519,11 +527,11 @@
519527
if (!initialized) return;
520528

521529
deinitAll();
522-
530+
523531
for (var i = watchArray.length - 1; i >= 0; i--) {
524532
watchArray[i] = getElementParams(watchArray[i].node);
525533
}
526-
534+
527535
initAll();
528536
}
529537

@@ -541,7 +549,7 @@
541549

542550
function stop() {
543551
pause();
544-
deinitAll();
552+
deinitAll();
545553
}
546554

547555
function kill() {
@@ -592,7 +600,8 @@
592600
stop: stop,
593601
kill: kill
594602
};
595-
})
603+
});
604+
596605

597606
/***/ },
598607

‎js/lib/state-pages.min.js

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -134,21 +134,28 @@
134134

135135
/*!
136136
* Stickyfill -- `position: sticky` polyfill
137-
* v. 1.1.1 | https://github.com/wilddeer/stickyfill
137+
* v. 1.1.9 | https://github.com/wilddeer/stickyfill
138138
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
139139
*
140140
* MIT License
141141
*/
142-
143-
module.exports = (function(doc, win) {
142+
/*!
143+
* Stickyfill -- `position: sticky` polyfill
144+
* v. 1.1.4 | https://github.com/wilddeer/stickyfill
145+
* Copyright Oleg Korsunsky | http://wd.dizaina.net/
146+
*
147+
* MIT License
148+
*/
149+
150+
module.exports = (function(doc, win) {
144151
if (!doc) {
145152
doc = document;
146153
}
147154

148155
if (!win) {
149156
win = window;
150157
}
151-
158+
152159
var watchArray = [],
153160
scroll,
154161
initialized = false,
@@ -193,7 +200,7 @@
193200
}
194201

195202
function mergeObjects(targetObj, sourceObject) {
196-
for (key in sourceObject) {
203+
for (var key in sourceObject) {
197204
if (sourceObject.hasOwnProperty(key)) {
198205
targetObj[key] = sourceObject[key];
199206
}
@@ -217,7 +224,7 @@
217224
rebuild();
218225
return;
219226
}
220-
227+
221228
if (win.pageYOffset != scroll.top) {
222229
updateScrollPos();
223230
recalcAllPos();
@@ -264,7 +271,7 @@
264271
}
265272

266273
function initElement(el) {
267-
if (isNaN(parseFloat(el.computed.top)) || el.isCell) return;
274+
if (isNaN(parseFloat(el.computed.top)) || el.isCell || el.computed.display == 'none') return;
268275

269276
el.inited = true;
270277

@@ -390,7 +397,8 @@
390397
marginBottom: computedStyle.marginBottom,
391398
marginLeft: computedStyle.marginLeft,
392399
marginRight: computedStyle.marginRight,
393-
cssFloat: computedStyle.cssFloat
400+
cssFloat: computedStyle.cssFloat,
401+
display: computedStyle.display
394402
},
395403
numeric = {
396404
top: parseNumeric(computedStyle.top),
@@ -416,7 +424,7 @@
416424
},
417425
nodeOffset = getElementOffset(node),
418426
parentOffset = getElementOffset(parentNode),
419-
427+
420428
parent = {
421429
node: parentNode,
422430
css: {
@@ -513,8 +521,8 @@
513521
updateScrollPos();
514522
initAll();
515523

516-
win.addEventListener('scroll', onScroll);
517-
win.addEventListener('wheel', onWheel);
524+
win.addEventListener('scroll', onScroll, { passive: true });
525+
win.addEventListener('wheel', onWheel, { passive: true });
518526

519527
//watch for width changes
520528
win.addEventListener('resize', rebuild);
@@ -532,11 +540,11 @@
532540
if (!initialized) return;
533541

534542
deinitAll();
535-
543+
536544
for (var i = watchArray.length - 1; i >= 0; i--) {
537545
watchArray[i] = getElementParams(watchArray[i].node);
538546
}
539-
547+
540548
initAll();
541549
}
542550

@@ -554,7 +562,7 @@
554562

555563
function stop() {
556564
pause();
557-
deinitAll();
565+
deinitAll();
558566
}
559567

560568
function kill() {
@@ -605,7 +613,8 @@
605613
stop: stop,
606614
kill: kill
607615
};
608-
})
616+
});
617+
609618

610619
/***/ },
611620
/* 5 */,

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"list.js": "^1.1.1",
2323
"object-assign": "^4.1.0",
2424
"pty.js": "github:chjj/pty.js",
25-
"stickyfill": "^1.1.1",
25+
"stickyfill": "github:18f/stickyfill#master",
2626
"svg4everybody": "github:18f/svg4everybody#non-symbol",
2727
"svgeo": "^0.3.5",
2828
"topojson": "github:mbostock/topojson#oversize",

0 commit comments

Comments
 (0)