From 70aa9e9012be5b8c8c3c8c3e9c01a94d77bd00e9 Mon Sep 17 00:00:00 2001
From: Bruno Alves de Faria <brunoalvesdefaria@gmail.com>
Date: Thu, 17 Nov 2016 13:07:05 -0200
Subject: [PATCH] LT-357: Thumbnails were not showing when loading study
 firstly from quick switch

---
 .../studyTimepointStudy.js                    | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js b/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js
index ee5fb8cd4..75d8c54a0 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/studyTimepointBrowser/studyTimepointStudy.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { _ } from 'meteor/underscore';
+import { $ } from 'meteor/jquery';
 
 Template.studyTimepointStudy.onCreated(() => {
     const instance = Template.instance();
@@ -9,9 +10,15 @@ Template.studyTimepointStudy.onCreated(() => {
     instance.loading = new ReactiveVar(false);
 
     // Get the current study element
-    instance.getStudyElement = () => {
+    instance.getStudyElement = (isGlobal=false) => {
         const studyInstanceUid = instance.data.study.studyInstanceUid;
-        return instance.$browser.find(`.studyTimepointStudy[data-uid='${studyInstanceUid}']`);
+        const selector = `.studyTimepointStudy[data-uid='${studyInstanceUid}']`;
+        return isGlobal ? $(selector) : instance.$browser.find(selector);
+    };
+
+    // Set all the studies with the same uid to loading state
+    instance.setLoading = () => {
+
     };
 
     // Set the current study as selected in the studies list
@@ -76,6 +83,17 @@ Template.studyTimepointStudy.events({
         instance.select(true);
     },
 
+    // Set loading state
+    'loadStarted .studyTimepointStudy'(event, instance) {
+        instance.loading.set(true);
+    },
+
+    // Remove loading state and fix the thumbnails wrappers height
+    'loadEnded .studyTimepointStudy'(event, instance) {
+        instance.loading.set(false);
+        instance.initializeStudyWrapper();
+    },
+
     // Changes the current study selection for the clicked study
     'click .studyModality'(event, instance) {
         const studyData = instance.data.study;
@@ -89,14 +107,15 @@ Template.studyTimepointStudy.events({
             const alreadyLoaded = ViewerStudies.findOne({ _id });
 
             if (!alreadyLoaded) {
-                instance.loading.set(true);
+                const $studies = instance.getStudyElement(true);
+                $studies.trigger('loadStarted');
                 getStudyMetadata(studyInstanceUid, study => {
                     study.displaySets = createStacks(study);
                     instance.data.study = study;
                     ViewerStudies.insert(study, () => {
                         // To make sure studies are rendered in the DOM
                         // use minimongo insert callback
-                        instance.initializeStudyWrapper();
+                        $studies.trigger('loadEnded');
                         instance.select(isQuickSwitch);
                     });
                 });