Author: rbaxter85
Date: Thu Mar 7 14:15:28 2013
New Revision: 1453883
URL: http://svn.apache.org/r1453883
Log:
Reverted code change as it is causing test failures
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=1453883&r1=1453882&r2=1453883&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 14:15:28 2013
@@ -166,13 +166,10 @@ 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 gadgetInfo = this.getActiveSiteHolder().gadgetInfo_;
- if (gadgetInfo && gadgetInfo.modulePrefs && gadgetInfo.modulePrefs.title) {
- return gadgetInfo.modulePrefs.title;
- } else {
- return osapi.container.Site.DEFAULT_TITLE;
- }
+ return osapi.container.Site.DEFAULT_TITLE;
}
};