Author: ivol37 at gmail.com
Date: Wed Nov 3 10:21:15 2010
New Revision: 238
Log:
[AMDATU-150] Fixed JavaScript errors by updating js and jsp to use the new
shindig 2.0 features
Modified:
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
trunk/application-bundles/dashboard-bundle/src/main/resources/static/js/dashboard.js
Modified:
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
==============================================================================
---
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
(original)
+++
trunk/application-bundles/dashboard-bundle/src/main/resources/jsp/dashboard.jsp
Wed Nov 3 10:21:15 2010
@@ -17,9 +17,7 @@
<script type="text/javascript"
src="/dashboard/static/js/lib/jquery.dashboard.js"></script>
<script type="text/javascript"
src="/dashboard/static/js/lib/themeroller.js"></script>
- <script type="text/javascript"
src="/gadgets/js/shindig-container:rpc.js?c=1&debug=1&nocache=1"></script>
- <script type="text/javascript"
src="/gadgets/js/shindig-container:util.js"></script>
- <script type="text/javascript"
src="/gadgets/js/shindig-container:cookies.js"></script>
+ <script type="text/javascript"
src="/gadgets/js/shindig-container:pubsub-2.js?c=1&debug=1"></script>
<script type="text/javascript">
$(function() {
Modified:
trunk/application-bundles/dashboard-bundle/src/main/resources/static/js/dashboard.js
==============================================================================
---
trunk/application-bundles/dashboard-bundle/src/main/resources/static/js/dashboard.js
(original)
+++
trunk/application-bundles/dashboard-bundle/src/main/resources/static/js/dashboard.js
Wed Nov 3 10:21:15 2010
@@ -56,10 +56,10 @@
// FIXME: move this to another js file
my.LayoutManager = function() {
- gadgets.LayoutManager.call(this);
+ shindig.LayoutManager.call(this);
};
- my.LayoutManager.inherits(gadgets.LayoutManager);
+ my.LayoutManager.inherits(shindig.LayoutManager);
my.LayoutManager.prototype.getGadgetChrome = function(gadget) {
@@ -70,24 +70,24 @@
};
my.init = function() {
- gadgets.container.layoutManager = new my.LayoutManager();
+ shindig.container.layoutManager = new my.LayoutManager();
};
my.init();
my.renderGadget = function(widget) {
var metadata = widget.metadata;
if (typeof metadata != 'undefined' && typeof metadata.gadgeturl !=
'undefined') {
- var gadget = gadgets.container.createGadget(
+ var gadget = shindig.container.createGadget(
{serviceName: widget.id, specUrl: metadata.gadgeturl, width: "100%",
secureToken: widget.securetoken});
- gadgets.container.addGadget(gadget);
+ shindig.container.addGadget(gadget);
- var chrome = gadgets.container.layoutManager.getGadgetChrome(gadget);
+ var chrome = shindig.container.layoutManager.getGadgetChrome(gadget);
// Don't render the header div
if (chrome) {
getMainContent(gadget, function(content) {
chrome.innerHTML = content;
- window.frames[gadget.getIframeId()].location = gadget.getIframeUrl();
+ window.frames[gadget.getIframeId()].location =
this.getIframeUrl(gadget);
});
}
};
@@ -98,15 +98,35 @@
var iframeId = gadget.getIframeId();
gadgets.rpc.setRelayUrl(iframeId, gadget.serverBase_ + gadget.rpcRelay);
gadgets.rpc.setAuthToken(iframeId, gadget.rpcToken);
-
continuation('<iframe id="' +
- iframeId + '" src="' + gadget.getIframeUrl() + '" name="' + iframeId +
'" class="' + gadget.cssClassGadget +
+ iframeId + '" src="about:blank" name="' + iframeId + '" class="' +
gadget.cssClassGadget +
'" src="about:blank' +
'" frameborder="no" scrolling="no"' +
(gadget.height ? ' height="' + gadget.height + '"' : '') +
(gadget.width ? ' width="' + gadget.width + '"' : '') +
'></iframe>');
};
+
+ getIframeUrl = function(gadget) {
+ return gadget.serverBase_ + 'ifr?' +
+ 'container=' + gadget.CONTAINER +
+ '&mid=' + gadget.id +
+ '&nocache=' + shindig.container.nocache_ +
+ '&country=' + shindig.container.country_ +
+ '&lang=' + shindig.container.language_ +
+ '&view=' + shindig.container.view_ +
+ (gadget.specVersion ? '&v=' + gadget.specVersion : '') +
+ (shindig.container.parentUrl_ ? '&parent=' +
encodeURIComponent(shindig.container.parentUrl_) : '') +
+ (gadget.debug ? '&debug=1' : '') +
+ gadget.getAdditionalParams() +
+ gadget.getUserPrefsParams() +
+ (gadget.secureToken ? '&st=' + gadget.secureToken : '') +
+ '&url=' + encodeURIComponent(gadget.specUrl) +
+ '#rpctoken=' + gadget.rpcToken +
+ (gadget.viewParams ?
+ '&view-params=' +
encodeURIComponent(gadgets.json.stringify(gadget.viewParams)) : '') +
+ (gadget.hashData ? '&' + gadget.hashData : '');
+ }
$('.widget').live('widgetLoaded',function(e, obj){
my.renderGadget(obj);
