From 59824e034c5053603b27640391eb3c461ed8dbe4 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:19:57 -0700 Subject: [PATCH 01/84] initial commit for gh pages shit --- gh-pages/index.js | 0 gh-pages/src/App.js | 9 +++++++++ 2 files changed, 9 insertions(+) create mode 100644 gh-pages/index.js create mode 100644 gh-pages/src/App.js diff --git a/gh-pages/index.js b/gh-pages/index.js new file mode 100644 index 0000000..e69de29 diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js new file mode 100644 index 0000000..34adfa4 --- /dev/null +++ b/gh-pages/src/App.js @@ -0,0 +1,9 @@ +import React, { Component, PropTypes } from 'react'; + +export default class App extends Component { + render() { + return
+ Hello world! +
; + } +} From dba4e1b4b55185080fbbea777642f9fe26a3719f Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:21:58 -0700 Subject: [PATCH 02/84] more shit --- .gitignore | 1 + gh-pages/index.html | 4 ++-- gh-pages/index.js | 3 +++ gh-pages/src/App.js | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b947077..413ab80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules/ dist/ +gh-pages/js/ diff --git a/gh-pages/index.html b/gh-pages/index.html index 1e62365..b7f680e 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -6,7 +6,7 @@ Javascript Easing Functions - body +
- From 69151247ae664b311157bf9e80723cfbfc9cb69e Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:54:08 -0700 Subject: [PATCH 10/84] dlkjer --- gh-pages/index.js | 2 +- package.json | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gh-pages/index.js b/gh-pages/index.js index 6e0c54c..7133110 100644 --- a/gh-pages/index.js +++ b/gh-pages/index.js @@ -1,4 +1,4 @@ import App from './src/App'; +import ReactDOM from 'react-dom'; -console.log('rendering in to ',document.getElementById( 'app' )); ReactDOM.render( , document.getElementById( 'app' ) ); diff --git a/package.json b/package.json index abf141b..00aab67 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,10 @@ "babel-plugin-transform-runtime": "^6.6.0", "babel-preset-react": "^6.5.0", "babel-preset-stage-0": "^6.5.0", + "eslint": "^2.6.0", + "eslint-config-airbnb": "^6.2.0", + "eslint-plugin-import": "^1.4.0", + "eslint-plugin-react": "^4.2.3", "react": "^0.14.8", "react-dom": "^0.14.8", "webpack": "^1.12.14", From 46668fbb3d84bfe838fc970e3a3e578dddcb8bbe Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:54:53 -0700 Subject: [PATCH 11/84] lol --- gh-pages/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gh-pages/index.js b/gh-pages/index.js index 7133110..ba850cc 100644 --- a/gh-pages/index.js +++ b/gh-pages/index.js @@ -1,4 +1,5 @@ import App from './src/App'; +import React from 'react'; import ReactDOM from 'react-dom'; ReactDOM.render( , document.getElementById( 'app' ) ); From 70e068acc0891f13464c2395b3e261c11db8462d Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:56:16 -0700 Subject: [PATCH 12/84] diner --- gh-pages/src/App.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index 18a95e1..8b41459 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -1,8 +1,10 @@ import React, { Component, PropTypes } from 'react'; +import * as easing from '../src/easing'; export default class App extends Component { render() { + console.log(easing, Object.keys(easing)); return
Hello world!
; From bf295c1d4fd1a63e0d6d87458c38126d2ea815e6 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:57:23 -0700 Subject: [PATCH 13/84] du --- gh-pages/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index 8b41459..906c0c4 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -1,5 +1,5 @@ import React, { Component, PropTypes } from 'react'; -import * as easing from '../src/easing'; +import * as easing from '../../src/easing'; export default class App extends Component { From fba1a3116033ff12841a0c84af3dc758dda1e76a Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 17:58:35 -0700 Subject: [PATCH 14/84] d --- .eslintrc | 63 ++++++++++++++++++++++++++++++++++++++ webpack.config.gh-pages.js | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..4f51350 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,63 @@ +{ "extends": "eslint-config-airbnb", + "env": { + "browser": true, + "node": true, + "mocha": true + }, + "rules": { + "no-use-before-define": 1, + "no-dupe-class-members": 1, + "no-multiple-empty-lines": 0, + "no-else-return": 0, + "no-cond-assign": 0, + "guard-for-in": 0, + "no-nested-ternary": 0, + "no-multi-spaces": 0, + "no-trailing-spaces": 0, + "comma-spacing": 0, + "new-cap": 0, + "react/prop-types": 0, + "react/no-did-mount-set-state": 0, + "react/sort-comp": 0, + "react/no-multi-comp": 0, + "react/wrap-multilines": 0, + "import/default": 0, + "import/no-duplicates": 0, + "import/named": 0, + "import/namespace": 0, + "import/no-unresolved": 0, + "import/no-named-as-default": 2, + "no-loop-func": 0, + // Temporarirly disabled due to a possible bug in babel-eslint (todomvc example) + "block-scoped-var": 0, + // Temporarily disabled for test/* until babel/babel-eslint#33 is resolved + "padded-blocks": 0, + "comma-dangle": 0, // not sure why airbnb turned this on. gross! + "indent": 0, + "spaced-comment": 0, + "no-console": 0, + "no-alert": 0, + "no-unused-vars": 0, + "space-after-keywords": 0, + "id-length": 0 + "space-in-parens": 0, + }, + "plugins": [ + "react", "import" + ], + "settings": { + "import/parser": "babel-eslint", + "import/resolve": { + moduleDirectory: ["node_modules", "src"] + } + }, + "globals": { + "__DEVELOPMENT__": true, + "__CLIENT__": true, + "__SERVER__": true, + "__DISABLE_SSR__": true, + "__DEVTOOLS__": true, + "socket": true, + "webpackIsomorphicTools": true + } +} diff --git a/webpack.config.gh-pages.js b/webpack.config.gh-pages.js index 3b484c2..3d001c3 100644 --- a/webpack.config.gh-pages.js +++ b/webpack.config.gh-pages.js @@ -12,7 +12,7 @@ var config = { loaders: [{ test: /\.js$/, loader: 'babel-loader', - include: /gh-pages\//, + include: /gh-pages\/|src\//, }] }, resolve: { From f1acd3801fc865ea9f1d7ebc7d27bb8d8f521ec6 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:06:01 -0700 Subject: [PATCH 15/84] i no poodle --- gh-pages/src/App.js | 8 ++++++- gh-pages/src/EasePreview.js | 47 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gh-pages/src/EasePreview.js diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index 906c0c4..a2e8949 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -1,4 +1,5 @@ import React, { Component, PropTypes } from 'react'; +import EasePreview from './EasePreview'; import * as easing from '../../src/easing'; export default class App extends Component { @@ -6,7 +7,12 @@ export default class App extends Component { render() { console.log(easing, Object.keys(easing)); return
- Hello world! + { Object.keys( easing ).map( fnName => + + ) }
; } diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js new file mode 100644 index 0000000..f133715 --- /dev/null +++ b/gh-pages/src/EasePreview.js @@ -0,0 +1,47 @@ +import React, { Component, PropTypes } from 'react'; +import * as easing from '../../src/easing'; + +const points = new Array( 100 ).fill( 0 ); + +export default class App extends Component { + + static propTypes = { + easingFunction: PropTypes.fn.isRequired, + title: PropTypes.string.isRequired + } + + render() { + + const { title, easingFunction } = this.props; + + return
+ { fnName } +
+ { points.map( ( zero, index ) => +
+ ) } +
+ +
; + + } + +} From d6ec1eb51dca8416164543f807e2e4e65b9795cc Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:06:33 -0700 Subject: [PATCH 16/84] no --- gh-pages/src/App.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index a2e8949..ae00f36 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -5,7 +5,6 @@ import * as easing from '../../src/easing'; export default class App extends Component { render() { - console.log(easing, Object.keys(easing)); return
{ Object.keys( easing ).map( fnName => Date: Sun, 3 Apr 2016 18:07:01 -0700 Subject: [PATCH 17/84] oh func --- gh-pages/src/EasePreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index f133715..857b1c5 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -6,7 +6,7 @@ const points = new Array( 100 ).fill( 0 ); export default class App extends Component { static propTypes = { - easingFunction: PropTypes.fn.isRequired, + easingFunction: PropTypes.func.isRequired, title: PropTypes.string.isRequired } From e70ebd80346d76a01aeb6d57da599d63dc704b58 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:09:08 -0700 Subject: [PATCH 18/84] slider --- gh-pages/src/EasePreview.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 857b1c5..bbf9149 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -16,6 +16,7 @@ export default class App extends Component { return
{ fnName } +
) }
- + + { easingFunction.length > 1 ? + + : null } +
; } From c7f3155ac79977a454fe1a6c9e8f40706f767fb2 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:10:11 -0700 Subject: [PATCH 19/84] no --- gh-pages/src/EasePreview.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index bbf9149..d92ffa0 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -15,8 +15,13 @@ export default class App extends Component { const { title, easingFunction } = this.props; return
- { fnName } - +
+ { title } +
Date: Sun, 3 Apr 2016 18:11:12 -0700 Subject: [PATCH 20/84] no --- gh-pages/index.html | 10 ++++++++++ gh-pages/src/EasePreview.js | 6 +----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index de154b3..0a41b0c 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -4,6 +4,16 @@ Javascript Easing Functions +
diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index d92ffa0..3cd29de 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -33,12 +33,8 @@ export default class App extends Component { > { points.map( ( zero, index ) =>
Date: Sun, 3 Apr 2016 18:15:56 -0700 Subject: [PATCH 21/84] no --- gh-pages/index.html | 19 ++++++++++++++++++- gh-pages/src/EasePreview.js | 7 ++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 0a41b0c..3c22810 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -13,10 +13,27 @@ border-radius: 10px; background: #121125; } + + .ease { + float:left; + width:100px; + margin:10px 15px 0 0; + text-align:center; + background:#F5DEDC; + } + + #app { + max-width:960px; + } + -
+
+

Javascript Easing Functions

+

by Andrew Ray (blog)

+
+
diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 3cd29de..88c0d6c 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -14,21 +14,22 @@ export default class App extends Component { const { title, easingFunction } = this.props; - return
+ return
{ title }
{ points.map( ( zero, index ) => From 2f27f9050af5f40c49e19d4b196221132b8644d4 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:18:18 -0700 Subject: [PATCH 22/84] sty --- gh-pages/index.html | 9 +++++++++ gh-pages/src/EasePreview.js | 9 ++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 3c22810..0fed4d9 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -13,8 +13,17 @@ border-radius: 10px; background: #121125; } + + .ease-label { + font-family: Georgia; + font-size: 20px; + color: #66305B; + margin:0 0 6px; + } .ease { + padding:4px 12px; + border-radius:4px; float:left; width:100px; margin:10px 15px 0 0; diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 88c0d6c..f1045b4 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -15,12 +15,7 @@ export default class App extends Component { const { title, easingFunction } = this.props; return
-
- { title } +
{ title }
) } From b85c5a592d039067211a3e76e1f53ff4129ec33b Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:19:24 -0700 Subject: [PATCH 23/84] k --- gh-pages/index.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index 0fed4d9..b2dc1a1 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -32,9 +32,26 @@ } #app { + margin:0 auto; max-width:960px; } + h1, h2, h3 { + font-family:sans-serif; + } + + h1 { + margin:0 0 5px; + font-size:28px; + padding:0; + } + + h3 { + margin:0 0 20px; + font-size:23px; + padding:0; + } + From 7771a9c6983320d7246c8116d8345fd6a833ab56 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:19:46 -0700 Subject: [PATCH 24/84] m --- gh-pages/src/App.js | 1 + gh-pages/src/EasePreview.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index ae00f36..97b3ef9 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -8,6 +8,7 @@ export default class App extends Component { return
{ Object.keys( easing ).map( fnName => diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index f1045b4..59f25c3 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -15,7 +15,8 @@ export default class App extends Component { const { title, easingFunction } = this.props; return
-
{ title } +
+ { title }
{ points.map( ( zero, index ) =>
Date: Sun, 3 Apr 2016 18:22:45 -0700 Subject: [PATCH 25/84] i dunno --- gh-pages/index.html | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index b2dc1a1..2b154fa 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -6,6 +6,7 @@ Javascript Easing Functions From b594b4522d0d67d93f075fa2ebcecccc5b35afcb Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:22:57 -0700 Subject: [PATCH 26/84] no --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 2b154fa..6f36632 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -44,7 +44,7 @@ h1 { color:#66305B; margin:0 0 5px; - font-size:28px; + font-size:32px; padding:0; } From dda201b766263ce49a92d53f34ee7da7a2a47c06 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:23:38 -0700 Subject: [PATCH 27/84] no --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 6f36632..64c8800 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -32,7 +32,7 @@ margin:0 0 6px; } - #wrap { + .wrap { margin:0 auto; max-width:960px; } From 8134270c188eb27aeddd869c66d829d48d3c9237 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:28:29 -0700 Subject: [PATCH 28/84] test --- gh-pages/index.html | 14 ++++++++++++-- gh-pages/src/EasePreview.js | 15 +++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 64c8800..c942e3a 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -6,7 +6,7 @@ Javascript Easing Functions From 5d5229df1e4a3750e6bbdfe0d2a45d742d9c0f52 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:45:52 -0700 Subject: [PATCH 41/84] no --- gh-pages/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 99ba238..11c8b73 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -12,11 +12,11 @@ border-radius:4px; float:left; width:120px; - height:120px; + height:160px; margin:15px 20px 0 0; text-align:center; background:#F5DEDC; - border: 1px solid #ffddee; + border: 1px solid #ffeefa; } .dot { From 544e17a162259e3e046adb7b668371cd91328497 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:46:32 -0700 Subject: [PATCH 42/84] dull --- gh-pages/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 11c8b73..59be6d6 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -34,8 +34,8 @@ position: relative; width: 100px; height: 100px; - border-left: 1px dashed #FFCFB4; - border-bottom: 1px dashed #FFCFB4; + border-left: 1px dashed #aaa; + border-bottom: 1px dashed #aaa; } .ease-label { From 9797413faf7b6818ca1544165642866d4e254017 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:47:56 -0700 Subject: [PATCH 43/84] st --- gh-pages/index.html | 6 +++--- gh-pages/src/EasePreview.js | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 59be6d6..e457f49 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -34,15 +34,15 @@ position: relative; width: 100px; height: 100px; - border-left: 1px dashed #aaa; - border-bottom: 1px dashed #aaa; + border-left: 1px solid #bbb; + border-bottom: 1px solid #bbb; } .ease-label { font-family: Georgia; font-size: 16px; color: #121125; - margin:0 0 6px; + margin:0 0 10px; } .wrap { diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 9c2204d..1879233 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -34,7 +34,12 @@ export default class App extends Component { { easingFunction.length > 1 ? : null } From 741dccbb9d95a0d9b31a60fe91f9943b5344197d Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:48:52 -0700 Subject: [PATCH 44/84] subtl --- gh-pages/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index e457f49..8af63c2 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -36,6 +36,7 @@ height: 100px; border-left: 1px solid #bbb; border-bottom: 1px solid #bbb; + background:#FFEEEC; } .ease-label { From e523df2c98350cffcc0458f9eeb564aacb1b6800 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:50:34 -0700 Subject: [PATCH 45/84] no --- gh-pages/index.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 8af63c2..471fe5e 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -10,10 +10,10 @@ box-shadow:0 0 8px #8C8382; padding:4px 12px; border-radius:4px; - float:left; + display:inline-block; width:120px; height:160px; - margin:15px 20px 0 0; + margin:15px 15px 0 15px; text-align:center; background:#F5DEDC; border: 1px solid #ffeefa; @@ -88,6 +88,10 @@

Javascript Easing Functions

by Andrew Ray (blog)

+

+ Github Repository: + https://github.com/DelvarWorld/easing-functions +

From 16a403517d0085ac15e92c0e1e7e2b32d1a93599 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:52:34 -0700 Subject: [PATCH 46/84] t --- gh-pages/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index 471fe5e..6fd2480 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -92,6 +92,12 @@

by Andrew Ray (< Github Repository: https://github.com/DelvarWorld/easing-functions

+

+ These are examples of the Javascript easing functions found in this repository. Hover over any example to see an animation representing the easing function. If the function is configurable, you can use the slider to change its configuration. +

+

+ To use this library, pass any value between 0 and 1 to the easing function, and it will returned the eased value. +

From cfc3223cffd045fd730a5ef84517cd31cd87f985 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:54:32 -0700 Subject: [PATCH 47/84] nemo --- gh-pages/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index 6fd2480..b1a8c4f 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -5,6 +5,18 @@ Javascript Easing Functions +
+
+

Javascript Easing Functions

+

by Andrew Ray (blog)

+
+
-

Javascript Easing Functions

-

by Andrew Ray (blog)

Github Repository: https://github.com/DelvarWorld/easing-functions From adb77e653a99443da04eeab3896c7bc19922002a Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:56:17 -0700 Subject: [PATCH 49/84] no --- gh-pages/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index cd8a7f8..f3189ba 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -59,7 +59,8 @@ } header { - background:#F5DEDC; + background:#FFFEFC; + padding:20px 0; } .wrap { From fec436c98688360d7d0bccf31096042aee277007 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:57:11 -0700 Subject: [PATCH 50/84] no --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index f3189ba..55647f4 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -59,7 +59,7 @@ } header { - background:#FFFEFC; + background:#FFF0EC; padding:20px 0; } From a8e75508b2f9463e24fc8b6c0a577c8a8e88b3c5 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 18:57:40 -0700 Subject: [PATCH 51/84] reading with --- gh-pages/index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index 55647f4..1246ffb 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -99,6 +99,11 @@ width:100px; } + p { + max-width:600px; + margin:0 auto; + } + From c8db9efd66762c07775e74836d42b0b27fbe317a Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:01:00 -0700 Subject: [PATCH 52/84] whoops --- gh-pages/index.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 1246ffb..46f4164 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -59,8 +59,10 @@ } header { + box-shadow:inset 0 6px 20px #F0E0DB; background:#FFF0EC; padding:20px 0; + margin:0 0 20px; } .wrap { @@ -82,7 +84,7 @@ h3 { color:#66305B; font-style:italic; - margin:0 0 20px; + margin:0 0 5px; font-size:18px; padding:0; } @@ -100,8 +102,9 @@ } p { + display:block; max-width:600px; - margin:0 auto; + margin:0 auto 20px; } From 6d74d538ce25a20706ea4b5140c8d11a787ea20c Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:03:53 -0700 Subject: [PATCH 53/84] k --- gh-pages/index.html | 13 +++++++++++-- gh-pages/src/EasePreview.js | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 46f4164..bd96b3f 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -10,7 +10,7 @@ font-family:sans-serif; margin:0; padding:0; - font-size:14px; + font-size:16px; } a { @@ -93,8 +93,17 @@ color:#511212; } - label { + .ease label { + opacity:0.2; font-size:12px; + position:absolute; + left:0; + bottom:10px; + padding:8px 14px; + background:#F0C0B0; + } + .ease:hover label { + opacity:1; } input[ type="range" ] { diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 1879233..9cf71b0 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import * as easing from '../../src/easing'; -const points = new Array( 100 ).fill( 0 ); +const points = new Array( 200 ).fill( 0 ); export default class App extends Component { @@ -25,7 +25,7 @@ export default class App extends Component { className="dot" style={{ left: `${ index }px`, - top: `${ 100 - 100 * easingFunction( index * 0.01 ) }px`, + top: `${ 100 - 100 * easingFunction( index * 0.005 ) }px`, }} /> ) } From 9c2048e0d9d7c2de957c46c81400e456b9d284cd Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:04:50 -0700 Subject: [PATCH 54/84] q --- gh-pages/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index bd96b3f..f10ccb1 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -29,6 +29,7 @@ text-align:center; background:#F5DEDC; border: 1px solid #ffeefa; + position:relative: } .dot { @@ -101,9 +102,10 @@ bottom:10px; padding:8px 14px; background:#F0C0B0; + border-radius:4px; } .ease:hover label { - opacity:1; + opacity:0.8; } input[ type="range" ] { From be7b21857796c73373301307462b6ed18d4bce6d Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:06:48 -0700 Subject: [PATCH 55/84] kkt --- gh-pages/index.html | 3 ++- gh-pages/src/EasePreview.js | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index f10ccb1..0a21c8d 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -95,6 +95,7 @@ } .ease label { + width:100px; opacity:0.2; font-size:12px; position:absolute; @@ -102,7 +103,7 @@ bottom:10px; padding:8px 14px; background:#F0C0B0; - border-radius:4px; + border-radius:8px; } .ease:hover label { opacity:0.8; diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 9cf71b0..ece3478 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -1,7 +1,8 @@ import React, { Component, PropTypes } from 'react'; import * as easing from '../../src/easing'; -const points = new Array( 200 ).fill( 0 ); +const pointCount = 200; +const points = new Array( pointCount ).fill( 0 ); export default class App extends Component { @@ -24,8 +25,8 @@ export default class App extends Component { key={ index } className="dot" style={{ - left: `${ index }px`, - top: `${ 100 - 100 * easingFunction( index * 0.005 ) }px`, + left: `${ index * ( 100 / pointCount ) }px`, + top: `${ 100 - 100 * easingFunction( index * ( 1 / pointCount ) ) }px`, }} /> ) } @@ -34,6 +35,7 @@ export default class App extends Component { { easingFunction.length > 1 ?

+ return
{ title }
+ { visible ?
: null } { points.map( ( zero, index ) =>
Date: Sun, 3 Apr 2016 19:22:45 -0700 Subject: [PATCH 62/84] here goes --- gh-pages/src/App.js | 1 + gh-pages/src/EasePreview.js | 26 +++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index 97b3ef9..6dcff9d 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -5,6 +5,7 @@ import * as easing from '../../src/easing'; export default class App extends Component { render() { + return
{ Object.keys( easing ).map( fnName => { + this.reqAnimId = window.requestAnimationFrame( this._onAnimate ); + }) } onMouseLeave() { + window.cancelAnimationFrame( this.reqAnimId ); this.setState({ + timestamp: null, visible: false }); @@ -42,7 +62,7 @@ export default class App extends Component { render() { const { title, easingFunction } = this.props; - const { visible, playHead } = this.props; + const { visible, playHead } = this.state; return
Date: Sun, 3 Apr 2016 19:25:30 -0700 Subject: [PATCH 63/84] t --- gh-pages/src/EasePreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index c05f46e..d7cf283 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -31,7 +31,7 @@ export default class App extends Component { this.setState({ timestamp: timestamp || currentTimestamp, - playHead: ( currentTimestamp - startTime ) % playDurationMs + playHead: 100 * ( ( ( currentTimestamp - startTime ) / playDurationMs ) % 1 ) }); this.reqAnimId = window.requestAnimationFrame( this._onAnimate ); From 3aae5528f43fcbdafb3c61b815fb665c3d256aa1 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:25:51 -0700 Subject: [PATCH 64/84] 2 --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 2290d52..fa602b3 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -126,7 +126,7 @@ p { display:block; - max-width:600px; + max-width:780px; margin:0 auto 20px; } From 314a493617d05bac21cea3ff739fd124e9500243 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:26:55 -0700 Subject: [PATCH 65/84] show me those logs --- gh-pages/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index fa602b3..4fdd3b8 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -45,6 +45,10 @@ .playhead { background:red; + z-index:2; + margin:-2px 0 -2px 0; + height:4px; + width:4px; } .graph { From e875fdaa3b0f22e2beaafe6c0baa935c72fef82b Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:28:16 -0700 Subject: [PATCH 66/84] tartl --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 4fdd3b8..07c8611 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -116,7 +116,7 @@ border-radius:8px; } .ease:hover { - background:#F8DFDE; + background:#F8EFEE; } .ease:hover label { opacity:0.8; From 6bb7f0d7b1ac403b5219b433e4653791ba77c090 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:30:22 -0700 Subject: [PATCH 67/84] no dingl --- gh-pages/index.html | 1 + gh-pages/src/EasePreview.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 07c8611..cb369df 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -45,6 +45,7 @@ .playhead { background:red; + opacity:1; z-index:2; margin:-2px 0 -2px 0; height:4px; diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index d7cf283..5d18be7 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -31,7 +31,7 @@ export default class App extends Component { this.setState({ timestamp: timestamp || currentTimestamp, - playHead: 100 * ( ( ( currentTimestamp - startTime ) / playDurationMs ) % 1 ) + playHead: pointCount * ( ( ( currentTimestamp - startTime ) / playDurationMs ) % 1 ) }); this.reqAnimId = window.requestAnimationFrame( this._onAnimate ); From 3048e8047ae5eada8f91f3eb0c05864a6d01c1a1 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:32:50 -0700 Subject: [PATCH 68/84] what --- gh-pages/index.html | 24 ++++++++++++++++++++++++ gh-pages/src/EasePreview.js | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/gh-pages/index.html b/gh-pages/index.html index cb369df..a8ff76d 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -52,6 +52,30 @@ width:4px; } + .pointer { + background:red; + opacity:1; + left:auto; + right:10px; + margin:-3px 0; + height:6px; + width:10px; + + } + + .pointer:before { + content:''; + display:block; + position:absolute; + left:-3px; + top:3px; + width: 0; + height: 0; + border-top: 6px solid transparent; + border-bottom: 6px solid transparent; + border-right:6px solid red; + } + .graph { display: inline-block; position: relative; diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 5d18be7..e96e514 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -72,6 +72,12 @@ export default class App extends Component { { title }
+ { visible ?
: null } { visible ?
Date: Sun, 3 Apr 2016 19:34:39 -0700 Subject: [PATCH 69/84] t --- gh-pages/index.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index a8ff76d..8707d35 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -58,9 +58,9 @@ left:auto; right:10px; margin:-3px 0; - height:6px; - width:10px; - + height:8px; + width:16px; + border-radius:0 4px 4px 0; } .pointer:before { @@ -68,12 +68,12 @@ display:block; position:absolute; left:-3px; - top:3px; + top:0; width: 0; height: 0; - border-top: 6px solid transparent; - border-bottom: 6px solid transparent; - border-right:6px solid red; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + border-right:4px solid red; } .graph { From b9b817f93b719cb6afca9416a204a6d1fb5dddb1 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:35:37 -0700 Subject: [PATCH 70/84] y --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 8707d35..e0b1309 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -56,7 +56,7 @@ background:red; opacity:1; left:auto; - right:10px; + right:-10px; margin:-3px 0; height:8px; width:16px; From c85060a0d69a1de17c77be9866cae6dc539fe3a2 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:36:18 -0700 Subject: [PATCH 71/84] drogas --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index e0b1309..8b68915 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -56,7 +56,7 @@ background:red; opacity:1; left:auto; - right:-10px; + right:-20px; margin:-3px 0; height:8px; width:16px; From 5c6e0164d1e41a7c260b0594da35de2bd7f3afe6 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:37:19 -0700 Subject: [PATCH 72/84] 2 is 2 many --- gh-pages/src/EasePreview.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index e96e514..fe870b6 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import * as easing from '../../src/easing'; -const playDurationMs = 2000; +const playDurationMs = 1000; const pointCount = 200; const points = new Array( pointCount ).fill( 0 ); From 4c776693b9cddf16c0e337030537d5ab3dcdc2d2 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:37:51 -0700 Subject: [PATCH 73/84] more test --- gh-pages/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 8b68915..2ddead5 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -135,7 +135,7 @@ font-size:12px; position:absolute; left:12px; - bottom:-6px; + bottom:-18px; padding:4px 12px; background:#F0C0B0; border-radius:8px; From 7c9df137176965beda1e485efda487c9576b5510 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:45:45 -0700 Subject: [PATCH 74/84] oh lol --- gh-pages/index.html | 2 +- gh-pages/src/EasePreview.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gh-pages/index.html b/gh-pages/index.html index 2ddead5..9241619 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -1,5 +1,5 @@ - + diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index fe870b6..826ddce 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -1,7 +1,7 @@ import React, { Component, PropTypes } from 'react'; import * as easing from '../../src/easing'; -const playDurationMs = 1000; +const playDurationMs = 1200; const pointCount = 200; const points = new Array( pointCount ).fill( 0 ); From 1cbe36d93c0fe52aeb438413483725373fbcd902 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:49:39 -0700 Subject: [PATCH 75/84] wtf --- gh-pages/src/EasePreview.js | 14 +++++++++----- src/easing.js | 13 +++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 826ddce..78b8a2e 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -20,7 +20,10 @@ export default class App extends Component { this.onMouseEnter = this.onMouseEnter.bind( this ); this._onAnimate = this._onAnimate.bind( this ); - this.state = { time: 0 }; + this.state = { + time: 0, + magnitude: undefined + }; } @@ -62,7 +65,7 @@ export default class App extends Component { render() { const { title, easingFunction } = this.props; - const { visible, playHead } = this.state; + const { visible, playHead, magnitude } = this.state; return
: null } { visible ?
: null } { points.map( ( zero, index ) => @@ -91,7 +94,7 @@ export default class App extends Component { className="dot" style={{ left: `${ index * ( 100 / pointCount ) }px`, - top: `${ 100 - 100 * easingFunction( index * ( 1 / pointCount ) ) }px`, + top: `${ 100 - 100 * easingFunction( index * ( 1 / pointCount ), magnitude ) }px`, }} /> ) } @@ -103,6 +106,7 @@ export default class App extends Component {
Date: Sun, 3 Apr 2016 19:50:57 -0700 Subject: [PATCH 76/84] dungus --- src/easing.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/easing.js b/src/easing.js index d212354..dc4ce62 100644 --- a/src/easing.js +++ b/src/easing.js @@ -217,7 +217,7 @@ export function easeInElastic( t, magnitude = 0.7 ) { } // Fast acceleration, bounces to zero -export function easeOutElastic( t, magintude = 0.7 ) { +export function easeOutElastic( t, magnitude = 0.7 ) { const p = 1 - magnitude; const scaledTime = t * 2; @@ -235,9 +235,9 @@ export function easeOutElastic( t, magintude = 0.7 ) { } // Slow start and end, two bounches sandwich a fast motion -export function easeInOutElastic( t, magintude = 0.65 ) { +export function easeInOutElastic( t, magnitude = 0.65 ) { - const p = 1 - magintude; + const p = 1 - magnitude; if( t === 0 || t === 1 ) { return t; From 7c789ee696b3ea1f4e53713be7cd2c688db918ba Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:57:47 -0700 Subject: [PATCH 77/84] no --- gh-pages/src/App.js | 1 + gh-pages/src/EasePreview.js | 3 ++- webpack.config.gh-pages.js | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gh-pages/src/App.js b/gh-pages/src/App.js index 6dcff9d..ae5a105 100644 --- a/gh-pages/src/App.js +++ b/gh-pages/src/App.js @@ -11,6 +11,7 @@ export default class App extends Component { ) } diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index 78b8a2e..f2f87e2 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -9,7 +9,8 @@ export default class App extends Component { static propTypes = { easingFunction: PropTypes.func.isRequired, - title: PropTypes.string.isRequired + title: PropTypes.string.isRequired, + argCount: PropTypes.number.isRequired, } constructor( props ) { diff --git a/webpack.config.gh-pages.js b/webpack.config.gh-pages.js index 3d001c3..adcd313 100644 --- a/webpack.config.gh-pages.js +++ b/webpack.config.gh-pages.js @@ -19,6 +19,11 @@ var config = { extensions: [ '', '.js' ], }, plugins: [ + new webpack.DefinePlugin({ + 'process.env': { + NODE_ENV: '"production"' + }, + }), new webpack.NoErrorsPlugin(), new webpack.optimize.UglifyJsPlugin({ compress: { From 1165413a21c8c0973b4112a2cec3f5b54d90eb94 Mon Sep 17 00:00:00 2001 From: Andrew Ray Date: Sun, 3 Apr 2016 19:58:21 -0700 Subject: [PATCH 78/84] no god --- gh-pages/src/EasePreview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gh-pages/src/EasePreview.js b/gh-pages/src/EasePreview.js index f2f87e2..f924c55 100644 --- a/gh-pages/src/EasePreview.js +++ b/gh-pages/src/EasePreview.js @@ -65,7 +65,7 @@ export default class App extends Component { render() { - const { title, easingFunction } = this.props; + const { title, easingFunction, argCount } = this.props; const { visible, playHead, magnitude } = this.state; return
- { easingFunction.length > 1 ? + { argCount > 1 ?