From 680b372e14d32104a3bab65a0219a759671c7920 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 5 Jun 2019 12:37:00 -0400 Subject: [PATCH 1/4] Sneak in some eol consistency --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..fcadb2cf9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text eol=lf From 531abe0fbd393501b5080339ea98b673fe191246 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 5 Jun 2019 12:37:36 -0400 Subject: [PATCH 2/4] bump dependent package versions --- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 5fa923387..15f389324 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "hammerjs": "^2.0.8", "lodash.isequal": "4.5.0", "moment": "^2.24.0", - "ohif-core": "0.5.5", + "ohif-core": "0.5.6", "ohif-dicom-html-extension": "^0.0.2", "ohif-dicom-pdf-extension": "^0.0.6", "oidc-client": "1.7.x", @@ -92,7 +92,7 @@ "react-resize-detector": "^3.4.0", "react-router": "^4.3.1", "react-router-dom": "^4.3.1", - "react-viewerbase": "0.6.1", + "react-viewerbase": "0.7.0", "react-vtkjs-viewport": "^0.0.7", "redux": "^4.0.1", "redux-oidc": "3.1.x" diff --git a/yarn.lock b/yarn.lock index dc35ee6c7..a69761b26 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9702,10 +9702,10 @@ octokit-pagination-methods@^1.1.0: resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4" integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ== -ohif-core@0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.5.5.tgz#78ace87fa06b3b23a004414a702cc23cb00edf9d" - integrity sha512-BORJCxOWuVAx2CE6+LSdL5+1+PG6gkYgl6tyAZhHhAgT46DWAfbq8nkAIX7Rhwot0BWpAcHkkBWIavGOBOH24Q== +ohif-core@0.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/ohif-core/-/ohif-core-0.5.6.tgz#b626b2fdd5bebf53f4914a8701bedf2dc2c43b71" + integrity sha512-qe5/tHjnyPAGoNEdYZBJEejojBBOE9G5Y54vuTUnu2TUKkdbFPg2Kj/WzmLBMG/3PHcjMCqFm1JllEwcntRvOg== dependencies: "@babel/runtime" "^7.2.0" ajv "^6.10.0" @@ -11760,10 +11760,10 @@ react-transition-group@^2.0.0, react-transition-group@^2.2.0: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" -react-viewerbase@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.6.1.tgz#60cb6d1b9e90f627b3756f1e426505b9551d0485" - integrity sha512-1wGW4a8lHaG/j5WeC9/R9TZrJLthL6cm5IPDEmthTKF8PNiImMY1VgLR80aXDhfKYi8AVEyCEhOkvvXbPgBl1A== +react-viewerbase@0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/react-viewerbase/-/react-viewerbase-0.7.0.tgz#b0f48a0f003b849c280b8ca67927d4780c68b0dc" + integrity sha512-1VQXREKSsqxtOSSHRou0gjBODrSOjE8SBJ6/dHG0gPgdmeotOg68xPMKYf9K7fYyGZ6CDA7oVCAmdTE4SVYP5Q== dependencies: "@babel/runtime" "7.2.0" classnames "2.2.6" From 1eeada3319094733f76ea3e6d3801890b42bf75d Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 5 Jun 2019 12:37:59 -0400 Subject: [PATCH 3/4] Nuke tools until we can fix toolbar modules and nested buttons --- src/utils/getDefaultToolbarButtons.js | 42 --------------------------- 1 file changed, 42 deletions(-) diff --git a/src/utils/getDefaultToolbarButtons.js b/src/utils/getDefaultToolbarButtons.js index a4393eb3c..408f84c45 100644 --- a/src/utils/getDefaultToolbarButtons.js +++ b/src/utils/getDefaultToolbarButtons.js @@ -49,48 +49,6 @@ export default function() { icon: 'angle-left', active: false, }, - { - command: 'Bidirectional', - type: 'tool', - text: 'Bidirectional', - icon: 'measure-target', - active: false, - }, - { - command: 'Brush', - type: 'tool', - text: 'Brush', - icon: 'circle', - active: false, - }, - { - command: 'FreehandMouse', - type: 'tool', - text: 'Freehand', - icon: 'star', - active: false, - }, - { - command: 'EllipticalRoi', - type: 'tool', - text: 'EllipticalRoi', - icon: 'oval', - active: false, - }, - { - command: 'CircleRoi', - type: 'tool', - text: 'CircleRoi', - icon: 'dot-circle', - active: false, - }, - { - command: 'RectangleRoi', - type: 'tool', - text: 'RectangleRoi', - icon: 'square-o', - active: false, - }, { command: 'reset', type: 'command', From fa525bcb43ea429b384d3b604c9019662c21cf82 Mon Sep 17 00:00:00 2001 From: dannyrb Date: Wed, 5 Jun 2019 12:43:03 -0400 Subject: [PATCH 4/4] fix(toolbar): reduce the number of tools visible on the toolbar; bump package versions to deploy other fixes --- docs/latest/deployment/recipes/embedded-viewer.md | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/docs/latest/deployment/recipes/embedded-viewer.md b/docs/latest/deployment/recipes/embedded-viewer.md index c3590f7b1..672901fe5 100644 --- a/docs/latest/deployment/recipes/embedded-viewer.md +++ b/docs/latest/deployment/recipes/embedded-viewer.md @@ -21,11 +21,6 @@ include tags. Here's how it works: Google Fonts, Sanchez & Roboto -
  • - - fontawesome@5.7.2 - -
  • react@16.8.6 @@ -73,7 +68,7 @@ window.config = { }, ], }, -} +}; ```
    1. @@ -82,10 +77,10 @@ window.config = { ```js // Made available by the `ohif-viewer` script included in step 1 -var Viewer = window.OHIFStandaloneViewer.App -var app = React.createElement(Viewer, window.config, null) +var Viewer = window.OHIFStandaloneViewer.App; +var app = React.createElement(Viewer, window.config, null); -ReactDOM.render(app, document.getElementById('ohif-viewer-target')) +ReactDOM.render(app, document.getElementById('ohif-viewer-target')); ``` #### Tips & Tricks