From b1eb68521a82d90800226b6faa594e76ebef11ee Mon Sep 17 00:00:00 2001 From: Bruno Alves de Faria Date: Wed, 19 Oct 2016 10:55:39 +0100 Subject: [PATCH] LT-275: Moving the selectTree component to measurements package --- .../ohif-core/client/components/base/index.js | 1 - .../client/components/bootstrap/index.js | 4 -- .../components/playground/playground.html | 11 ----- .../components/playground/playground.js | 45 ------------------- .../client/components/index.js | 4 -- .../client/components/index.js | 1 + .../client/components/measureFlow/index.js | 5 +++ .../components/measureFlow/measureFlow.html | 0 .../components/measureFlow/measureFlow.js | 3 +- .../components/measureFlow/measureFlow.styl | 0 .../measureFlow/selectTree/index.js | 6 +++ .../measureFlow/selectTree/mixin.js} | 0 .../measureFlow/selectTree}/selectTree.html | 0 .../measureFlow/selectTree}/selectTree.js | 0 .../selectTree}/selectTreeCommon.html | 0 .../selectTree}/selectTreeCommon.js | 0 16 files changed, 14 insertions(+), 66 deletions(-) create mode 100644 Packages/ohif-measurements/client/components/measureFlow/index.js rename Packages/{ohif-lesiontracker => ohif-measurements}/client/components/measureFlow/measureFlow.html (100%) rename Packages/{ohif-lesiontracker => ohif-measurements}/client/components/measureFlow/measureFlow.js (98%) rename Packages/{ohif-lesiontracker => ohif-measurements}/client/components/measureFlow/measureFlow.styl (100%) create mode 100644 Packages/ohif-measurements/client/components/measureFlow/selectTree/index.js rename Packages/{ohif-core/client/components/base/mixins/selectTree.js => ohif-measurements/client/components/measureFlow/selectTree/mixin.js} (100%) rename Packages/{ohif-core/client/components/bootstrap/input => ohif-measurements/client/components/measureFlow/selectTree}/selectTree.html (100%) rename Packages/{ohif-core/client/components/bootstrap/input => ohif-measurements/client/components/measureFlow/selectTree}/selectTree.js (100%) rename Packages/{ohif-core/client/components/bootstrap/input => ohif-measurements/client/components/measureFlow/selectTree}/selectTreeCommon.html (100%) rename Packages/{ohif-core/client/components/bootstrap/input => ohif-measurements/client/components/measureFlow/selectTree}/selectTreeCommon.js (100%) diff --git a/Packages/ohif-core/client/components/base/index.js b/Packages/ohif-core/client/components/base/index.js index 34865171b..f961c003e 100644 --- a/Packages/ohif-core/client/components/base/index.js +++ b/Packages/ohif-core/client/components/base/index.js @@ -21,7 +21,6 @@ import './mixins/link.js'; import './mixins/schemaData.js'; import './mixins/select.js'; import './mixins/select2.js'; -import './mixins/selectTree.js'; // Templates import './templates/button.html'; diff --git a/Packages/ohif-core/client/components/bootstrap/index.js b/Packages/ohif-core/client/components/bootstrap/index.js index 45c1a90c2..4d2fd6117 100644 --- a/Packages/ohif-core/client/components/bootstrap/index.js +++ b/Packages/ohif-core/client/components/bootstrap/index.js @@ -20,7 +20,3 @@ import './input/radio.html'; import './input/range.html'; import './input/select.html'; import './input/text.html'; -import './input/selectTree.html'; -import './input/selectTree.js'; -import './input/selectTreeCommon.html'; -import './input/selectTreeCommon.js'; diff --git a/Packages/ohif-core/client/components/playground/playground.html b/Packages/ohif-core/client/components/playground/playground.html index b72f3c364..42125c8e0 100644 --- a/Packages/ohif-core/client/components/playground/playground.html +++ b/Packages/ohif-core/client/components/playground/playground.html @@ -1,16 +1,5 @@ diff --git a/Packages/ohif-core/client/components/playground/playground.js b/Packages/ohif-core/client/components/playground/playground.js index de6f7d478..71ac813de 100644 --- a/Packages/ohif-core/client/components/playground/playground.js +++ b/Packages/ohif-core/client/components/playground/playground.js @@ -1,48 +1,3 @@ -Template.componentPlayground.onCreated(() => { - const instance = Template.instance(); - instance.items = [{ - label: 'Category 1', - value: 'Category 1', - items: [{ - label: 'Subcategory 1.1', - value: 'Subcategory 1.1' - }, { - label: 'Subcategory 1.2', - value: 'Subcategory 1.2', - items: [{ - label: 'Subcategory 1.2.1', - value: 'Subcategory 1.2.1' - }, { - label: 'Subcategory 1.2.2', - value: 'Subcategory 1.2.2', - items: [{ - label: 'Subcategory 1.2.2.1', - value: 'Subcategory 1.2.2.1' - }, { - label: 'Subcategory 1.2.2.2', - value: 'Subcategory 1.2.2.2' - }] - }] - }] - }, { - label: 'Category 2', - value: 'Category 2', - items: [{ - label: 'Subcategory 2.1', - value: 'Subcategory 2.1' - }, { - label: 'Subcategory 2.2', - value: 'Subcategory 2.2' - }, { - label: 'Subcategory 2.3', - value: 'Subcategory 2.3' - }] - }, { - label: 'Category 3', - value: 'Category 3' - }]; -}); - Template.componentPlayground.onRendered(() => { const instance = Template.instance(); instance.$('.measure-flow').draggable(); diff --git a/Packages/ohif-lesiontracker/client/components/index.js b/Packages/ohif-lesiontracker/client/components/index.js index d25e3bd23..efc5cc160 100644 --- a/Packages/ohif-lesiontracker/client/components/index.js +++ b/Packages/ohif-lesiontracker/client/components/index.js @@ -16,7 +16,3 @@ import './nonTargetLesionDialog/nonTargetLesionDialog.js'; import './nonTargetResponseDialog/nonTargetResponseDialog.html'; import './nonTargetResponseDialog/nonTargetResponseDialog.styl'; import './nonTargetResponseDialog/nonTargetResponseDialog.js'; - -import './measureFlow/measureFlow.html'; -import './measureFlow/measureFlow.styl'; -import './measureFlow/measureFlow.js'; diff --git a/Packages/ohif-measurements/client/components/index.js b/Packages/ohif-measurements/client/components/index.js index 1fd6b08b7..b4ede4ca1 100644 --- a/Packages/ohif-measurements/client/components/index.js +++ b/Packages/ohif-measurements/client/components/index.js @@ -2,3 +2,4 @@ import './association'; import './caseProgress'; import './longitudinal'; import './measurementTable'; +import './measureFlow'; diff --git a/Packages/ohif-measurements/client/components/measureFlow/index.js b/Packages/ohif-measurements/client/components/measureFlow/index.js new file mode 100644 index 000000000..1f09fd668 --- /dev/null +++ b/Packages/ohif-measurements/client/components/measureFlow/index.js @@ -0,0 +1,5 @@ +import './selectTree'; + +import './measureFlow.html'; +import './measureFlow.styl'; +import './measureFlow.js'; diff --git a/Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.html b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.html similarity index 100% rename from Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.html rename to Packages/ohif-measurements/client/components/measureFlow/measureFlow.html diff --git a/Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.js b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.js similarity index 98% rename from Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.js rename to Packages/ohif-measurements/client/components/measureFlow/measureFlow.js index e9504775d..c474c7673 100644 --- a/Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.js +++ b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.js @@ -122,7 +122,7 @@ Template.measureFlow.events({ // Wait for DOM re-rendering, resize and focus the description textarea Tracker.afterFlush(() => { const $textarea = instance.$('textarea'); - $textarea.trigger('input').focus(); + $textarea.trigger('input').focus().select(); }); }, @@ -149,6 +149,7 @@ Template.measureFlow.events({ // Keep the current description if ENTER was pressed if (event.which === 13) { + event.preventDefault(); instance.description.set($(event.currentTarget).val()); } }, diff --git a/Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.styl b/Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl similarity index 100% rename from Packages/ohif-lesiontracker/client/components/measureFlow/measureFlow.styl rename to Packages/ohif-measurements/client/components/measureFlow/measureFlow.styl diff --git a/Packages/ohif-measurements/client/components/measureFlow/selectTree/index.js b/Packages/ohif-measurements/client/components/measureFlow/selectTree/index.js new file mode 100644 index 000000000..9f2d8da0a --- /dev/null +++ b/Packages/ohif-measurements/client/components/measureFlow/selectTree/index.js @@ -0,0 +1,6 @@ +import './mixin.js'; + +import './selectTree.html'; +import './selectTree.js'; +import './selectTreeCommon.html'; +import './selectTreeCommon.js'; diff --git a/Packages/ohif-core/client/components/base/mixins/selectTree.js b/Packages/ohif-measurements/client/components/measureFlow/selectTree/mixin.js similarity index 100% rename from Packages/ohif-core/client/components/base/mixins/selectTree.js rename to Packages/ohif-measurements/client/components/measureFlow/selectTree/mixin.js diff --git a/Packages/ohif-core/client/components/bootstrap/input/selectTree.html b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.html similarity index 100% rename from Packages/ohif-core/client/components/bootstrap/input/selectTree.html rename to Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.html diff --git a/Packages/ohif-core/client/components/bootstrap/input/selectTree.js b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.js similarity index 100% rename from Packages/ohif-core/client/components/bootstrap/input/selectTree.js rename to Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTree.js diff --git a/Packages/ohif-core/client/components/bootstrap/input/selectTreeCommon.html b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTreeCommon.html similarity index 100% rename from Packages/ohif-core/client/components/bootstrap/input/selectTreeCommon.html rename to Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTreeCommon.html diff --git a/Packages/ohif-core/client/components/bootstrap/input/selectTreeCommon.js b/Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTreeCommon.js similarity index 100% rename from Packages/ohif-core/client/components/bootstrap/input/selectTreeCommon.js rename to Packages/ohif-measurements/client/components/measureFlow/selectTree/selectTreeCommon.js