Author: erinnp
Date: Mon Jun 24 20:17:05 2013
New Revision: 1496195
URL: http://svn.apache.org/r1496195
Log:
widgets are rendering
Modified:
rave/branches/require/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
rave/branches/require/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java
Modified:
rave/branches/require/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
(original)
+++
rave/branches/require/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/tag/RegionWidgetTag.java
Mon Jun 24 20:17:05 2013
@@ -42,7 +42,7 @@ public class RegionWidgetTag extends Abs
// Script block for disabled gadget
private static final String DISABLED_SCRIPT_BLOCK =
- "<script>require(['core/rave_core'],
function(raveCore){raveCore.registerWidget('%1$s', {type: 'DISABLED'," +
+ "<script>require(['rave'],
function(rave){rave.registerWidget('%1$s', {type: 'DISABLED'," +
" regionWidgetId: '%2$s'," +
" disabledMessage: '%3$s'," +
" collapsed: %4$s," +
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
Mon Jun 24 20:17:05 2013
@@ -30,8 +30,6 @@ under the License.
<rave:rave_css/>
<rave:custom_css/>
<rave:third_party_head_js/>
- <%--TODO: Ask Erin about moving this.--%>
- <rave:rave_js/>
<portal:render-script location="${'HEAD'}" />
</head>
<body>
@@ -46,6 +44,8 @@ under the License.
<tiles:insertAttribute name="footer"/>
<%-- render any script that needs to execute pre-src includes --%>
<portal:render-init-script location="${'BEFORE_RAVE'}" />
+<%-- render rave_js tag --%>
+<rave:rave_js/>
<%-- render any script that needs to execute post-src includes --%>
<portal:render-init-script location="${'AFTER_RAVE'}" />
<%-- render custom javascript from extension projects if the tag is overlayed
--%>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/page.jsp
Mon Jun 24 20:17:05 2013
@@ -21,6 +21,7 @@
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
<jsp:useBean id="pages" type="java.util.List<org.apache.rave.model.Page>"
scope="request"/>
+<jsp:useBean id="pageUser" type="org.apache.rave.model.PageUser"
scope="request"/>
<jsp:useBean id="pageLayouts" type="java.util.List" scope="request"/>
<%--@elvariable id="page" type="org.apache.rave.model.Page"--%>
@@ -453,5 +454,4 @@
});
</script>
-
</portal:register-init-script>
\ No newline at end of file
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Mon Jun 24 20:17:05 2013
@@ -35,8 +35,6 @@
</c:otherwise>
</c:choose>
<script src="<spring:url value="/static/script/app.js"/>"></script>
-<portal:render-script location="${'AFTER_RAVE'}"/>
-<%-- common javascript to execute on all pages --%>
<script>
require(["rave"], function (rave) {
<%-- set the web application context --%>
@@ -52,5 +50,8 @@
<%-- set the javascript debug mode so js code has access to it --%>
<%--ui.setJavaScriptDebugMode(<c:out value="${jsDebugMode}"/>);--%>
- })
+ });
</script>
+<portal:render-script location="${'AFTER_RAVE'}"/>
+<%-- common javascript to execute on all pages --%>
+
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_head_js.tag
Mon Jun 24 20:17:05 2013
@@ -30,3 +30,5 @@
--%>
<!-- Modernizr MUST come first!-->
<script
src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.5.3/modernizr.min.js"></script>
+<%-- require.js --%>
+<script
src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.5/require.js"></script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
Mon Jun 24 20:17:05 2013
@@ -25,5 +25,3 @@
<script
src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<%-- google code css3 mediaqueries script --%>
<!--[if lt IE 9]><script
src="//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js"></script><![endif]-->
-<%-- require.js --%>
-<script
src="//cdnjs.cloudflare.com/ajax/libs/require.js/2.1.5/require.js"></script>
\ No newline at end of file
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
Mon Jun 24 20:17:05 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-define(['underscore', 'core/rave_api', 'core/rave_providers'], function(_,
api, providers){
+define(['underscore', 'core/rave_api', 'core/rave_view_manager',
'core/rave_providers'], function(_, api, viewManager, providers){
function getProvider(name) {
return providers[name.toLowerCase()];
@@ -55,7 +55,7 @@ define(['underscore', 'core/rave_api', '
//if el is a string, go to rave's view system
if (_.isString(el)) {
//TODO: potential memory leak - rendering a widget into new views
does not force cleanup of current view
- var view = rave.renderView(el, this);
+ var view = viewManager.renderView(el, this);
el = view.getWidgetSite();
this._view = view;
}
@@ -93,7 +93,7 @@ define(['underscore', 'core/rave_api', '
Widget.prototype.close = function (opts) {
this._provider.closeWidget(this, opts);
if (this._view) {
- rave.destroyView(this._view);
+ viewManager.destroyView(this._view);
}
api.rpc.removeWidget({
Modified:
rave/branches/require/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java?rev=1496195&r1=1496194&r2=1496195&view=diff
==============================================================================
---
rave/branches/require/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java
(original)
+++
rave/branches/require/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetWrapperRenderer.java
Mon Jun 24 20:17:05 2013
@@ -64,7 +64,7 @@ public class OpenSocialWidgetWrapperRend
//Note the widgets.push() call. This defines the widget objects, which are
//added to the widgets[] array in home.jsp.
private static final String SCRIPT_BLOCK =
- "<script>require(['core/rave_core'],
function(raveCore){raveCore.registerWidget('%1$s', {type: '%2$s'," +
+ "<script>require(['rave'],
function(rave){rave.registerWidget('%1$s', {type: '%2$s'," +
" regionWidgetId: '%3$s'," +
" widgetUrl: '%4$s', " +
" securityToken: '%5$s', " +
