diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages index 4786bac69..2a1c05b96 100644 --- a/LesionTracker/.meteor/packages +++ b/LesionTracker/.meteor/packages @@ -59,7 +59,5 @@ aldeed:simple-schema # Third party package to deal with schemas aldeed:template-extension@4.0.0 aldeed:collection2 zuuk:stale-session -johdirr:meteor-git-rev -cultofcoders:persistent-session@0.4.4 shell-server@0.3.1 underscore diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions index 9539121c6..0edce7e8a 100644 --- a/LesionTracker/.meteor/versions +++ b/LesionTracker/.meteor/versions @@ -31,7 +31,6 @@ clinical:router-location@2.1.0 clinical:router-middleware-stack@2.1.2 clinical:router-url@2.1.0 clinical:theming@0.4.10 -cultofcoders:persistent-session@0.4.5 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js index f9975bfc4..e597999a5 100644 --- a/LesionTracker/client/components/viewer/viewer.js +++ b/LesionTracker/client/components/viewer/viewer.js @@ -91,9 +91,6 @@ Template.viewer.onCreated(() => { OHIF.viewer.data.loadedSeriesData = {}; } - // Store the viewer data in session for further user - Session.setPersistent('ViewerData', OHIF.viewer.data); - Session.set('activeViewport', OHIF.viewer.data.activeViewport || false); // Set lesion tool buttons as disabled if pixel spacing is not available for active element diff --git a/OHIFViewer/.meteor/packages b/OHIFViewer/.meteor/packages index 16a8fbcac..2710bf464 100644 --- a/OHIFViewer/.meteor/packages +++ b/OHIFViewer/.meteor/packages @@ -46,7 +46,6 @@ fortawesome:fontawesome momentjs:moment@2.15.1 aldeed:simple-schema # Third party package to deal with schemas aldeed:template-extension -cultofcoders:persistent-session underscore@1.0.10 meteortesting:mocha react-template-helper diff --git a/OHIFViewer/.meteor/versions b/OHIFViewer/.meteor/versions index 953f00e1f..1c987f214 100644 --- a/OHIFViewer/.meteor/versions +++ b/OHIFViewer/.meteor/versions @@ -23,7 +23,6 @@ clinical:router@2.0.19 clinical:router-location@2.1.0 clinical:router-middleware-stack@2.1.2 clinical:router-url@2.1.0 -cultofcoders:persistent-session@0.4.5 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 @@ -37,7 +36,6 @@ ecmascript-runtime-client@0.8.0 ecmascript-runtime-server@0.7.1 ejson@1.1.0 es5-shim@4.8.0 -fastclick@1.0.13 fetch@0.1.0 fortawesome:fontawesome@4.7.0 geojson-utils@1.0.10 diff --git a/OHIFViewer/client/components/viewer/viewer.html b/OHIFViewer/client/components/viewer/viewer.html deleted file mode 100644 index e413c6151..000000000 --- a/OHIFViewer/client/components/viewer/viewer.html +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js index 078060bed..da224c734 100644 --- a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js +++ b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js @@ -39,7 +39,8 @@ export class HotkeysManager { } else if (OHIF.user.userLoggedIn()) { OHIF.user.setData(storageKey, definitions).then(resolve).catch(reject); } else { - Session.setPersistent(storageKey, definitions); + const definitionsJSON = JSON.stringify(definitions); + localStorage.setItem(storageKey, definitionsJSON); resolve(); } }); @@ -57,7 +58,9 @@ export class HotkeysManager { reject(error); } } else { - resolve(Session.get(storageKey)); + const definitionsJSON = localStorage.getItem(storageKey) || ''; + const definitions = JSON.parse(definitionsJSON) || undefined; + resolve(definitions); } }); } diff --git a/Packages/ohif-hotkeys/package.js b/Packages/ohif-hotkeys/package.js index 3d3949651..0b9d9b4a1 100644 --- a/Packages/ohif-hotkeys/package.js +++ b/Packages/ohif-hotkeys/package.js @@ -18,8 +18,7 @@ Package.onUse(function(api) { 'stylus', 'reactive-var', 'session', - 'clinical:router', - 'cultofcoders:persistent-session' + 'clinical:router' ]); // OHIF dependencies diff --git a/Packages/ohif-viewerbase/client/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js index 37ebc452f..54ad5ced8 100644 --- a/Packages/ohif-viewerbase/client/lib/WLPresets.js +++ b/Packages/ohif-viewerbase/client/lib/WLPresets.js @@ -143,7 +143,8 @@ class WindowLevelPresetsManager { } else if (OHIF.user.userLoggedIn()) { OHIF.user.setData(WL_STORAGE_KEY, wlPresets).then(resolve).catch(reject); } else { - Session.setPersistent(WL_STORAGE_KEY, wlPresets); + const wlPresetsJSON = JSON.stringify(wlPresets); + localStorage.setItem(WL_STORAGE_KEY, wlPresetsJSON); resolve(); } }).then(() => this.setOHIFWLPresets.call(this, wlPresets)); @@ -160,7 +161,9 @@ class WindowLevelPresetsManager { reject(error); } } else { - resolve(Session.get(WL_STORAGE_KEY)); + const wlPresetsJSON = localStorage.getItem(WL_STORAGE_KEY) || ''; + const wlPresets = JSON.parse(wlPresetsJSON) || undefined; + resolve(wlPresets); } }); } diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js index 12030e3ea..5431c7e8b 100644 --- a/Packages/ohif-viewerbase/package.js +++ b/Packages/ohif-viewerbase/package.js @@ -25,7 +25,6 @@ Package.onUse(function(api) { 'jquery', 'stylus', 'momentjs:moment', - 'cultofcoders:persistent-session' ]); // OHIF dependencies @@ -199,7 +198,6 @@ Package.onTest(function(api) { 'jquery', 'mongo', 'momentjs:moment', - 'cultofcoders:persistent-session' ], 'client'); // OHIF dependencies diff --git a/StandaloneViewer/StandaloneViewer/.meteor/packages b/StandaloneViewer/StandaloneViewer/.meteor/packages index 1eeb9aa50..80547e906 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/packages +++ b/StandaloneViewer/StandaloneViewer/.meteor/packages @@ -35,7 +35,6 @@ aldeed:simple-schema@1.5.3 stylus@=2.513.14 clinical:router session@1.2.0-beta181.7 -cultofcoders:persistent-session reactive-dict@1.3.0-beta181.7 fortawesome:fontawesome mrt:moment diff --git a/StandaloneViewer/StandaloneViewer/.meteor/versions b/StandaloneViewer/StandaloneViewer/.meteor/versions index bee1a9eff..d85df7e29 100644 --- a/StandaloneViewer/StandaloneViewer/.meteor/versions +++ b/StandaloneViewer/StandaloneViewer/.meteor/versions @@ -23,7 +23,6 @@ clinical:router@2.0.19 clinical:router-location@2.1.0 clinical:router-middleware-stack@2.1.2 clinical:router-url@2.1.0 -cultofcoders:persistent-session@0.4.5 ddp@1.4.0 ddp-client@2.3.3 ddp-common@1.4.0 diff --git a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js index b5de1124f..c87d3d3de 100644 --- a/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js +++ b/StandaloneViewer/StandaloneViewer/client/components/viewer/viewer.js @@ -110,9 +110,6 @@ Template.viewer.onCreated(() => { OHIF.viewer.data.activeViewport = 0; } - // Store the viewer data in session for further user - Session.setPersistent('ViewerData', OHIF.viewer.data); - Session.set('activeViewport', OHIF.viewer.data.activeViewport || 0); // @TypeSafeStudies