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/10 21:22:35 UTC

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

Author: rbaxter85
Date: Sun Mar 10 20:22:35 2013
New Revision: 1454914

URL: http://svn.apache.org/r1454914
Log:
gadget iframe title fix
Comitted for Marshall 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=1454914&r1=1454913&r2=1454914&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 Sun Mar 10 20:22:35 2013
@@ -166,9 +166,14 @@ 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 {
+    var siteHolder = this.getActiveSiteHolder();
+    if (siteHolder && siteHolder.gadgetInfo_) {
+      var gadgetInfo = siteHolder.gadgetInfo_;
+      if (gadgetInfo && gadgetInfo.modulePrefs && gadgetInfo.modulePrefs.title) {
+        return gadgetInfo.modulePrefs.title;
+      }
+    }
     return osapi.container.Site.DEFAULT_TITLE;
   }
 };