Commit 8845ea0

committed

smoother decelerating trickle

1 parent 6de3a45 commit 8845ea0Copy full SHA for 8845ea0

File tree

-20

lines changed

-20

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -133,12 +133,11 @@ Turn off the automatic incrementing behavior by setting this to `false`. (defaul
`133`	`133`	`NProgress.configure({ trickle: false });`
`134`	`134`	`~~~`
`135`	`135`
`136`		-#### `trickleRate` and `trickleSpeed`
`137`		`-You can adjust the trickleRate (how much to increase per trickle) and`
`138`		`-trickleSpeed (how often to trickle, in ms).`
	`136`	+#### `trickleSpeed`
	`137`	`+Adjust how often to trickle/increment, in ms.`
`139`	`138`
`140`	`139`	`~~~ js`
`141`		`-NProgress.configure({ trickleRate:0.02, trickleSpeed: 800 });`
	`140`	`+NProgress.configure({ trickleSpeed: 800 });`
`142`	`141`	`~~~`
`143`	`142`
`144`	`143`	#### `showSpinner`

Lines changed: 5 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -164,22 +164,11 @@`
`164`	`164`	`return;`
`165`	`165`	`} else {`
`166`	`166`	`if (typeof amount !== 'number') {`
`167`		`- if (n >= 0 && n < 0.25) {`
`168`		`- // Start out between 3 - 6% increments`
`169`		`- amount = (Math.random() * (5 - 3 + 1) + 3) / 100;`
`170`		`- } else if (n >= 0.25 && n < 0.65) {`
`171`		`- // increment between 0 - 3%`
`172`		`- amount = (Math.random() * 3) / 100;`
`173`		`- } else if (n >= 0.65 && n < 0.9) {`
`174`		`- // increment between 0 - 2%`
`175`		`- amount = (Math.random() * 2) / 100;`
`176`		`- } else if (n >= 0.9 && n < 0.99) {`
`177`		`- // finally, increment it .5 %`
`178`		`- amount = 0.005;`
`179`		`- } else {`
`180`		`- // after 99%, don't increment:`
`181`		`- amount = 0;`
`182`		`- }`
	`167`	`+ if (n >= 0 && n < 0.2) { amount = 0.1; }`
	`168`	`+ else if (n >= 0.2 && n < 0.5) { amount = 0.04; }`
	`169`	`+ else if (n >= 0.5 && n < 0.8) { amount = 0.02; }`
	`170`	`+ else if (n >= 0.8 && n < 0.99) { amount = 0.005; }`
	`171`	`+ else { amount = 0; }`
`183`	`172`	`}`
`184`	`173`
`185`	`174`	`n = clamp(n + amount, 0, 0.994);`

Comments

(0)