svn commit: r1678514 - /shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js

[ssievers]

Author: ssievers
Date: Sat May  9 18:21:27 2015
New Revision: 1678514

URL: http://svn.apache.org/r1678514
Log:
SHINDIG-1994 | The activeSiteHolder is undefined if called too soon after 
navigateGadget | Patch by Doug Davies.  Thanks!

Modified:
    
shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js

Modified: 
shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
URL: 
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js?rev=1678514&r1=1678513&r2=1678514&view=diff
==============================================================================
--- 
shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
 (original)
+++ 
shindig/trunk/features/src/main/javascript/features/container.site.gadget/gadget_site.js
 Sat May  9 18:21:27 2015
@@ -189,12 +189,14 @@ osapi.container.GadgetSite.prototype.nav
 
       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 @@ osapi.container.GadgetSite.prototype.nav
     timingInfo[osapi.container.NavigateTiming.XRT] = xrt;
     self.onNavigateTo(timingInfo);
 
-    // Possibly with an error. Leave to user to deal with raw response.
-    callback(gadgetInfo);
   });
 };