From a4b8f2c5ed66c0201d7475b3ee7ac833b7ad736f Mon Sep 17 00:00:00 2001 From: Evren Ozkan Date: Fri, 9 Nov 2018 13:22:14 -0500 Subject: [PATCH] fix(user-preferences): Fix the issues with saving/retrieving user preferences in OHIFViewer --- OHIFViewer/client/body.html | 3 +++ OHIFViewer/client/body.styl | 2 ++ Packages/ohif-hotkeys/client/classes/HotkeysManager.js | 4 ++-- Packages/ohif-viewerbase/client/lib/WLPresets.js | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 OHIFViewer/client/body.html create mode 100644 OHIFViewer/client/body.styl diff --git a/OHIFViewer/client/body.html b/OHIFViewer/client/body.html new file mode 100644 index 000000000..7ea7fcea5 --- /dev/null +++ b/OHIFViewer/client/body.html @@ -0,0 +1,3 @@ + +
+ diff --git a/OHIFViewer/client/body.styl b/OHIFViewer/client/body.styl new file mode 100644 index 000000000..aaa17e8fb --- /dev/null +++ b/OHIFViewer/client/body.styl @@ -0,0 +1,2 @@ +body + background-color: black \ No newline at end of file diff --git a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js index f684aa392..078060bed 100644 --- a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js +++ b/Packages/ohif-hotkeys/client/classes/HotkeysManager.js @@ -36,7 +36,7 @@ export class HotkeysManager { return new Promise((resolve, reject) => { if (this.storeFunction) { this.storeFunction.call(this, storageKey, definitions).then(resolve).catch(reject); - } else if (Meteor.userId()) { + } else if (OHIF.user.userLoggedIn()) { OHIF.user.setData(storageKey, definitions).then(resolve).catch(reject); } else { Session.setPersistent(storageKey, definitions); @@ -50,7 +50,7 @@ export class HotkeysManager { return new Promise((resolve, reject) => { if (this.retrieveFunction) { this.retrieveFunction(contextName).then(resolve).catch(reject); - } else if (OHIF.user) { + } else if (OHIF.user.userLoggedIn()) { try { resolve(OHIF.user.getData(storageKey)); } catch(error) { diff --git a/Packages/ohif-viewerbase/client/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js index a0c51eb93..37ebc452f 100644 --- a/Packages/ohif-viewerbase/client/lib/WLPresets.js +++ b/Packages/ohif-viewerbase/client/lib/WLPresets.js @@ -153,7 +153,7 @@ class WindowLevelPresetsManager { return new Promise((resolve, reject) => { if (this.retrieveFunction) { this.retrieveFunction.call(this).then(resolve).catch(reject); - } else if (OHIF.user) { + } else if (OHIF.user.userLoggedIn()) { try { resolve(OHIF.user.getData(WL_STORAGE_KEY)); } catch(error) {