From f5af70a218102a1a526ea3ebc53f4f89cd66b837 Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Fri, 27 Oct 2017 23:47:30 -0200 Subject: [PATCH] Improving polyfill inclusion and fixing SVG issues --- .../measurementTableHeaderRow.styl | 8 +- Packages/ohif-polyfill/client/all.js | 9 -- Packages/ohif-polyfill/client/ie.js | 14 ++- Packages/ohif-polyfill/client/index.js | 1 - .../ohif-polyfill/client/lib/writeScript.js | 13 ++- Packages/ohif-viewerbase/assets/icons.svg | 108 +++++------------- 6 files changed, 51 insertions(+), 102 deletions(-) delete mode 100644 Packages/ohif-polyfill/client/all.js diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl index bf867f96c..4ba442b63 100644 --- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl +++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl @@ -34,11 +34,11 @@ $headerRowHeight = 63px height: $headerRowHeight max-width: 11px - &:hover - theme('fill', '$hoverColor') + &:hover svg + theme('fill', '$hoverColor') - &:active - theme('fill', '$activeColor') + &:active svg + theme('fill', '$activeColor') .type theme('color', '$textSecondaryColor') diff --git a/Packages/ohif-polyfill/client/all.js b/Packages/ohif-polyfill/client/all.js deleted file mode 100644 index 8bff2339b..000000000 --- a/Packages/ohif-polyfill/client/all.js +++ /dev/null @@ -1,9 +0,0 @@ -import { Meteor } from 'meteor/meteor'; -import writeScript from './lib/writeScript'; - -// Fix SVG+USE issues -writeScript('svg4everybody.min.js'); -Meteor.startup(() => { - // Call the SVG polyfill - window.svg4everybody(); -}); diff --git a/Packages/ohif-polyfill/client/ie.js b/Packages/ohif-polyfill/client/ie.js index 62fd10ee3..d6b0909ef 100644 --- a/Packages/ohif-polyfill/client/ie.js +++ b/Packages/ohif-polyfill/client/ie.js @@ -1,6 +1,12 @@ +import { Meteor } from 'meteor/meteor'; import writeScript from './lib/writeScript'; -// Check if browser is IE and add the polyfill scripts -if (navigator && /MSIE \d|Trident.*rv:/.test(navigator.userAgent)) { - writeScript('typedarray.min.js'); -} +Meteor.startup(() => { + // Check if browser is IE and add the polyfill scripts + if (navigator && /MSIE \d|Trident.*rv:/.test(navigator.userAgent)) { + writeScript('typedarray.min.js'); + + // Fix SVG+USE issues by calling the SVG polyfill + writeScript('svg4everybody.min.js', () => window.svg4everybody()); + } +}); diff --git a/Packages/ohif-polyfill/client/index.js b/Packages/ohif-polyfill/client/index.js index 7cf48e90f..5c596a370 100644 --- a/Packages/ohif-polyfill/client/index.js +++ b/Packages/ohif-polyfill/client/index.js @@ -1,2 +1 @@ -import './all.js'; import './ie.js'; diff --git a/Packages/ohif-polyfill/client/lib/writeScript.js b/Packages/ohif-polyfill/client/lib/writeScript.js index 3363bd3fe..451e74f3b 100644 --- a/Packages/ohif-polyfill/client/lib/writeScript.js +++ b/Packages/ohif-polyfill/client/lib/writeScript.js @@ -1,7 +1,14 @@ /* jshint -W060 */ import absoluteUrl from './absoluteUrl'; -export default function(fileName) { - const src = absoluteUrl(`/packages/ohif_polyfill/public/js/${fileName}`); - document.write(`