Author: [email protected]
Date: Tue Jan 24 10:03:00 2012
New Revision: 1974
Log:
[AMDATUOPENSOCIAL-184] Fixed by removing the display:hidden property from the
initial iframe window. Also removed the default height of 150.
Modified:
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
Modified:
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
==============================================================================
---
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
(original)
+++
trunk/amdatu-opensocial/dashboard-plugin/src/main/resources/static/js/jquery.dashboard.js
Tue Jan 24 10:03:00 2012
@@ -992,7 +992,6 @@
open: true,
fullscreen: false,
loaded: false,
- height: 150,
url: '',
index:0,
metadata: {}
Modified:
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
==============================================================================
---
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
(original)
+++
trunk/amdatu-opensocial/opensocial-dashboard/src/main/resources/static/css/dashboardui.css
Tue Jan 24 10:03:00 2012
@@ -116,12 +116,10 @@
}
.loading {
- padding: 50px;
text-align: center;
background-image:loading.gif;
}
-
#layout-dialog ul {
margin:0;
padding:0;
Modified:
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-gadgetmanagement/src/main/java/org/amdatu/opensocial/gadgetmanagement/rest/BaseRESTServiceImpl.java
Tue Jan 24 10:03:00 2012
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -148,7 +148,7 @@
widget.setDescription(getGadgetSpecValue(gadgetSpec,
"description", ""));
// Set height
- widget.setHeight(getGadgetSpecValue(gadgetSpec, "height", "150"));
+ widget.setHeight(getGadgetSpecValue(gadgetSpec, "height", ""));
// Set screenshot
String defaultScreenshot =
@@ -261,10 +261,10 @@
if (userPrefsBytes != null) {
Map<String, Object> userPrefs =
(Map<String, Object>)
ConversionUtil.byteArrayToObject(userPrefsBytes);
-
+
// Explicitly convert this to a String map. Although the
Shindig AppData API
// takes a Map<String, String> as input argument, it will
pass values of other
- // types (i.e. Integer). The UserPref API assumes that
each preference is
+ // types (i.e. Integer). The UserPref API assumes that
each preference is
// stored as a String and so we must dot his conversion
and choose to do it here
return toStringMap(userPrefs);
}
@@ -272,7 +272,7 @@
}
return null;
}
-
+
private Map<String, String> toStringMap(Map<String, Object> values) {
Map<String, String> map = new HashMap<String, String>();
for (String key : values.keySet()) {
@@ -299,7 +299,7 @@
return null;
}
- private String getGadgetSpecValue(Map<String, String> spec, String key,
String defaultValue) {
+ protected String getGadgetSpecValue(Map<String, String> spec, String key,
String defaultValue) {
if (spec.get(key) != null && !"".equals(spec.get(key))) {
return spec.get(key);
}
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
Tue Jan 24 10:03:00 2012
@@ -48,7 +48,7 @@
/**
* Shindig implementation of the OpenSocialContainer interface.
- *
+ *
* @author ivol
*/
@@ -135,7 +135,7 @@
gadgetSpec.put("description",
spec.getModulePrefs().getDescription());
gadgetSpec.put("author", spec.getModulePrefs().getAuthor());
gadgetSpec.put("title_url",
spec.getModulePrefs().getTitleUrl().toString());
- gadgetSpec.put("height",
spec.getModulePrefs().getAttribute("height", "150"));
+ gadgetSpec.put("height",
spec.getModulePrefs().getAttribute("height", ""));
if (spec.getModulePrefs().getScreenshot() != null
&&
!spec.getModulePrefs().getScreenshot().toString().isEmpty()) {
@@ -161,7 +161,7 @@
}
public UserPrefsBean getUserPreferences(final String gadgetUrl, final
Map<String, String> userPrefValues) {
- try {
+ try {
GadgetSpec spec = m_processor.getGadgetSpec(gadgetUrl,
userPrefValues);
if (spec != null) {
Map<String, UserPref> userPrefs = spec.getUserPrefs();
@@ -192,11 +192,11 @@
}
up.setEnumValues(enumValueBeans);
}
-
+
userPrefsBean.addUserPref(up);
}
return userPrefsBean;
- }
+ }
return null;
}
catch (Exception e) {
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/resources/features/shindig.container/shindig-container.js
Tue Jan 24 10:03:00 2012
@@ -823,12 +823,11 @@
"var loading=document.getElementById('" + iframeId + "_loading');" +
"loading.style.visibility='hidden';" +
"loading.style.display='none';" +
- "iframe.style.visibility='';" +
- "iframe.style.display='';";
+ "iframe.style.visibility='';";
continuation('<div class="' + this.cssClassGadgetContent + '"><iframe
id="' +
iframeId + '" name="' + iframeId + '" class="' + this.cssClassGadget +
- '" style="visibility:hidden;display:none"' +
+ '" style="visibility:hidden"' +
'" src="about:blank' +
'" frameborder="no" scrolling="auto"' +
(this.height ? ' height="' + (parseInt(this.height) + 5) + '"' : '') +
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
