From c4793cbf0b7facb1695ae81d2bf0796b16c9e222 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Wed, 21 Feb 2018 16:35:15 -0300
Subject: [PATCH] Fixing cornerstone image promise issues

---
 .../lib/classes/StackImagePositionOffsetSynchronizer.js    | 7 +++++--
 .../client/lib/classes/StudyLoadingListener.js             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js b/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js
index 20c541892..e63286e9d 100644
--- a/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js
+++ b/Packages/ohif-viewerbase/client/lib/classes/StackImagePositionOffsetSynchronizer.js
@@ -69,8 +69,11 @@ export class StackImagePositionOffsetSynchronizer {
             this.synchronizer.add(viewport.element);
             this.syncedViewports.push(viewport);
             viewportIndexes.push(viewport.index);
+            if (!this.disabledListener) {
+                this.disabledListener = this.elementDisabledHandler(this);
+            }
 
-            $(viewport.element).on(StackImagePositionOffsetSynchronizer.ELEMENT_DISABLED_EVENT, this.elementDisabledHandler(this));
+            viewport.element.addEventListener(StackImagePositionOffsetSynchronizer.ELEMENT_DISABLED_EVENT, this.disabledListener);
         });
 
         this.active = true;
@@ -97,7 +100,7 @@ export class StackImagePositionOffsetSynchronizer {
         this.syncedViewports.splice(index, 1);
         this.synchronizer.remove(viewport.element);
         this.removeLinkedViewportFromSession(viewport);
-        $(viewport.element).off(StackImagePositionOffsetSynchronizer.ELEMENT_DISABLED_EVENT);
+        viewport.element.removeEventListener(StackImagePositionOffsetSynchronizer.ELEMENT_DISABLED_EVENT, this.disabledListener);
     }
 
     getViewportByElement(viewportElement) {
diff --git a/Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js b/Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js
index 8e2db6c2b..e7cbc4352 100644
--- a/Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js
+++ b/Packages/ohif-viewerbase/client/lib/classes/StudyLoadingListener.js
@@ -222,7 +222,7 @@ class StackLoadingListener extends BaseLoadingListener {
         /*for(let i = 0; i < imageIds.length; i++) {
             const imageId = imageIds[i];
 
-            const imagePromise = cornerstone.imageCache.getImagePromise(imageId);
+            const imagePromise = cornerstone.imageCache.getImageLoadObject(imageId).promise;
 
             if (imagePromise && (imagePromise.state() === 'resolved')) {
                 this._updateFrameStatus(imageId, true);