You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@shindig.apache.org by rb...@apache.org on 2013/03/07 14:54:30 UTC

svn commit: r1453870 - /shindig/trunk/features/src/main/javascript/features/container.site/site.js

Author: rbaxter85
Date: Thu Mar  7 13:54:29 2013
New Revision: 1453870

URL: http://svn.apache.org/r1453870
Log:
gadget iframe title fix
Committed For Mashall Shi

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

Modified: shindig/trunk/features/src/main/javascript/features/container.site/site.js
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/container.site/site.js?rev=1453870&r1=1453869&r2=1453870&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/container.site/site.js (original)
+++ shindig/trunk/features/src/main/javascript/features/container.site/site.js Thu Mar  7 13:54:29 2013
@@ -166,10 +166,13 @@ osapi.container.Site.prototype.setTitle 
 osapi.container.Site.prototype.getTitle = function() {
   if (typeof(this.title_) !== 'undefined') {
     return this.title_;
-  } else if (this.gadgetInfo_ && this.gadgetInfo_.modulePrefs && this.gadgetInfo_.modulePrefs.title) {
-    return this.gadgetInfo_.modulePrefs.title;
   } else {
-    return osapi.container.Site.DEFAULT_TITLE;
+    var gadgetInfo = this.getActiveSiteHolder().gadgetInfo_;
+    if (gadgetInfo && gadgetInfo.modulePrefs && gadgetInfo.modulePrefs.title) {
+      return gadgetInfo.modulePrefs.title;
+    } else {
+      return osapi.container.Site.DEFAULT_TITLE;
+    }
   }
 };