Author: erinnp
Date: Fri Aug 16 17:33:40 2013
New Revision: 1514811
URL: http://svn.apache.org/r1514811
Log:
merged from trunk
Modified:
rave/branches/angular/ (props changed)
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
Propchange: rave/branches/angular/
------------------------------------------------------------------------------
Merged /rave/trunk:r1514544-1514809
Modified:
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js?rev=1514811&r1=1514810&r2=1514811&view=diff
==============================================================================
---
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
(original)
+++
rave/branches/angular/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
Fri Aug 16 17:33:40 2013
@@ -117,7 +117,8 @@ define(['underscore', 'core/rave_view_ma
var widget = args.gs._widget,
viewSurface = viewName.split('.')[0],
renderInto = viewManager.getView(viewSurface) ? viewSurface :
widget._el;
-
+ //If the element has no ID then it was launched in some secondary
location. Destroy the view.
+ if(widget._el.id === "") viewManager.destroyView(widget._view);
widget.render(renderInto, {view: viewName, view_params:
opt_params, ownerId: opt_ownerId});
}
Modified:
rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
URL:
http://svn.apache.org/viewvc/rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java?rev=1514811&r1=1514810&r2=1514811&view=diff
==============================================================================
---
rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
(original)
+++
rave/branches/angular/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/model/OpenSocialRegionWidget.java
Fri Aug 16 17:33:40 2013
@@ -19,23 +19,28 @@
package org.apache.rave.provider.opensocial.web.model;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.rave.rest.model.RegionWidget;
import javax.xml.bind.annotation.*;
+import java.util.Map;
@XmlAccessorType(XmlAccessType.FIELD)
public class OpenSocialRegionWidget extends RegionWidget {
- @XmlElement(name="securityToken")
+ @XmlElement(name = "securityToken")
protected String securityToken;
- @XmlElement(name="metadata")
- protected String metadata;
+ @XmlElement(name = "metadata")
+ protected Map<String, Object> metadata;
- public OpenSocialRegionWidget() { }
+ private static ObjectMapper mapper = new ObjectMapper();
+
+ public OpenSocialRegionWidget() {
+ }
public OpenSocialRegionWidget(RegionWidget base, String securityToken,
String metadata) {
this(base);
this.securityToken = securityToken;
- this.metadata = metadata;
+ setMetadata(metadata);
}
public OpenSocialRegionWidget(RegionWidget base) {
@@ -59,11 +64,17 @@ public class OpenSocialRegionWidget exte
this.securityToken = securityToken;
}
- public String getMetadata() {
+ public Map<String, Object> getMetadata() {
return metadata;
}
public void setMetadata(String metadata) {
- this.metadata = metadata;
+ Map<String, Object> metadataObject = null;
+ try {
+ metadataObject = mapper.readValue(metadata, Map.class);
+ } catch (Exception e) {
+ //TODO: Do we need to handle this exception somehow?
+ }
+ this.metadata = metadataObject;
}
}
