From ca1ce9ba763a56adc4e564f852c806aeae30bac4 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 24 Oct 2017 17:23:10 +0200 Subject: [PATCH 1/5] Dont cache auth --- routes/api/auth/index.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/routes/api/auth/index.js b/routes/api/auth/index.js index 791573898..1af57fb54 100644 --- a/routes/api/auth/index.js +++ b/routes/api/auth/index.js @@ -12,6 +12,10 @@ router.get('/', (req, res, next) => { return; } + res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate'); + res.header('Expires', '-1'); + res.header('Pragma', 'no-cache'); + // Send back the user object. res.json({user: req.user}); }); From 934b630ce26efc2fb028c926ca2beb330e65ad57 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Tue, 24 Oct 2017 18:47:55 +0200 Subject: [PATCH 2/5] Simplified Spinner for IE and Edge for Spinner (using css hacks) --- client/coral-ui/components/Spinner.css | 65 +++++++++----------------- 1 file changed, 23 insertions(+), 42 deletions(-) diff --git a/client/coral-ui/components/Spinner.css b/client/coral-ui/components/Spinner.css index 00b7f93a5..da09758f1 100644 --- a/client/coral-ui/components/Spinner.css +++ b/client/coral-ui/components/Spinner.css @@ -4,49 +4,28 @@ } .spinner { - -webkit-animation: rotator 1.4s linear infinite; animation: rotator 1.4s linear infinite; } -@-webkit-keyframes rotator { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(270deg); - transform: rotate(270deg); - } -} - @keyframes rotator { 0% { - -webkit-transform: rotate(0deg); transform: rotate(0deg); } 100% { - -webkit-transform: rotate(270deg); transform: rotate(270deg); } } + + + .path { + stroke: #f67150; stroke-dasharray: 187; stroke-dashoffset: 0; - -webkit-transform-origin: center; transform-origin: center; - -webkit-animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite; animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite; } -@-webkit-keyframes colors { - 0% { - stroke: #f67150; - } - 100% { - stroke: #f6a47e; - } -} - @keyframes colors { 0% { stroke: #f67150; @@ -55,33 +34,35 @@ stroke: #f6a47e; } } -@-webkit-keyframes dash { - 0% { - stroke-dashoffset: 187; - } - 50% { - stroke-dashoffset: 46.75; - -webkit-transform: rotate(135deg); - transform: rotate(135deg); - } - 100% { - stroke-dashoffset: 187; - -webkit-transform: rotate(450deg); - transform: rotate(450deg); - } -} + @keyframes dash { 0% { stroke-dashoffset: 187; } 50% { stroke-dashoffset: 46.75; - -webkit-transform: rotate(135deg); transform: rotate(135deg); } 100% { stroke-dashoffset: 187; - -webkit-transform: rotate(450deg); transform: rotate(450deg); } } + +@keyframes fullRotator { + 0% { + transform: rotate(0deg); + } + 100% { + transform: rotate(360deg); + } +} + +/* Hack for IE and Edge as they don't support css animations on SVG elements. */ +_:-ms-lang(x), .path { + stroke-dasharray: 160; +} + +_:-ms-lang(x), .spinner { + animation: fullRotator 1.4s linear infinite; +} From 27eb159a75dc85807c464cd28d51a61f4cf329de Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 25 Oct 2017 13:04:41 +0200 Subject: [PATCH 3/5] Add special popup handling for ie 11 --- client/coral-framework/components/Popup.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/coral-framework/components/Popup.js b/client/coral-framework/components/Popup.js index 33041442f..41a37237a 100644 --- a/client/coral-framework/components/Popup.js +++ b/client/coral-framework/components/Popup.js @@ -22,6 +22,9 @@ export default class Popup extends Component { ); this.setCallbacks(); + + // For some reasons IE needs a timeout before setting the callbacks... + setTimeout(() => this.setCallbacks(), 1000); } setCallbacks() { From 16bf8871614574e5c747982a415f75b3f1d854ff Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 25 Oct 2017 13:06:00 +0200 Subject: [PATCH 4/5] Add ie to ci testing --- scripts/e2e-ci.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh index 1e4f45691..f1376abcb 100755 --- a/scripts/e2e-ci.sh +++ b/scripts/e2e-ci.sh @@ -21,9 +21,7 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then # Test using browserstack. browserstack chrome browserstack firefox - - # temporarily turn off ci, please fix https://www.pivotaltracker.com/story/show/152144406. - # browserstack ie + browserstack ie # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old. # browserstack safari From 823bf18335af4463dd7ac5ab22f65aa94888bca6 Mon Sep 17 00:00:00 2001 From: Chi Vinh Le Date: Wed, 25 Oct 2017 14:19:13 +0200 Subject: [PATCH 5/5] Add edge to ci --- scripts/e2e-ci.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/e2e-ci.sh b/scripts/e2e-ci.sh index f1376abcb..e0e94b4bf 100755 --- a/scripts/e2e-ci.sh +++ b/scripts/e2e-ci.sh @@ -22,13 +22,11 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then browserstack chrome browserstack firefox browserstack ie + browserstack edge # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old. # browserstack safari - # Edge 14 & 15 randomly fails when switching from the login popup back to the main window. - # browserstack edge - exit $exitCode else # When browserstack is not available test locally using chrome headless.