SHINDIG-1994 | The activeSiteHolder is undefined if called too soon after navigateGadget | Patch by Doug Davies.  Thanks!

git-svn-id: https://svn.apache.org/repos/asf/shindig/trunk@1678514 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/features/src/main/javascript/features/container.site.gadget/gadget_site.js b/features/src/main/javascript/features/container.site.gadget/gadget_site.js
index bba54bb..9870f01 100644
--- a/features/src/main/javascript/features/container.site.gadget/gadget_site.js
+++ b/features/src/main/javascript/features/container.site.gadget/gadget_site.js
@@ -189,12 +189,14 @@
 

       message = ['Detailed error: ', gadgetInfo.error.code || '', ' ', gadgetInfo.error.message || ''].join('');

       gadgets.log(message);

+      callback(gadgetInfo);

     } else {

       var moduleId = renderParams[osapi.container.RenderParam.MODULE_ID] || 0;

       self.setModuleId_(gadgetUrl, moduleId, function() {

         self.container_.applyLifecycleCallbacks_(osapi.container.CallbackType.ON_BEFORE_RENDER,

                 gadgetInfo);

         self.render(gadgetInfo, viewParams, renderParams);

+        callback(gadgetInfo);

       });

     }

 

@@ -206,8 +208,6 @@
     timingInfo[osapi.container.NavigateTiming.XRT] = xrt;

     self.onNavigateTo(timingInfo);

 

-    // Possibly with an error. Leave to user to deal with raw response.

-    callback(gadgetInfo);

   });

 };