Author: erinnp
Date: Fri Jun 28 19:49:07 2013
New Revision: 1497900
URL: http://svn.apache.org/r1497900
Log:
tracking down bad dependencies and error sources
Modified:
rave/branches/require/rave-portal-resources/pom.xml
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.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/jsp/views/personProfile.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js
rave/branches/require/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java
Modified: rave/branches/require/rave-portal-resources/pom.xml
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/pom.xml?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
--- rave/branches/require/rave-portal-resources/pom.xml (original)
+++ rave/branches/require/rave-portal-resources/pom.xml Fri Jun 28 19:49:07 2013
@@ -125,9 +125,9 @@
<include>core/rave_ajax.js</include>
</sourceIncludes>
<preloadSources>
-
<source>http://localhost:8234/src/test/dependencies/require.js</source>
-
<source>http://localhost:8234/src/test/dependencies/testr.js</source>
-
<source>http://localhost:8234/src/test/dependencies/underscore.js</source>
+ <source>/src/test/dependencies/require.js</source>
+ <source>/src/test/dependencies/testr.js</source>
+ <source>/src/test/dependencies/underscore.js</source>
</preloadSources>
<customRunnerTemplate>src/test/testTemplate.htmltemplate</customRunnerTemplate>
</configuration>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.w3c.jsp
Fri Jun 28 19:49:07 2013
@@ -137,7 +137,7 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["rave", "jquery", "jqueryUi"], function(rave, $){
+ require(["rave", "ui", "jquery"], function(rave, ui, $){
$(function() {
if ($('#url').val().length === 0) {
$('#addWidgetForm').hide();
@@ -167,16 +167,15 @@
url: "?all=true",
providerType: "W3C",
alertInvalidParams: function(){
-
alert(ravePortal.getClientMessage("api.widget_metadata.invalid_params"));
+
alert(ui.getClientMessage("api.widget_metadata.invalid_params"));
},
errorCallback: function(){
-
alert(ravePortal.getClientMessage("api.widget_metadata.parse_error"));
+
alert(ui.getClientMessage("api.widget_metadata.parse_error"));
},
successCallback: function(result) {
- var i=0;
var widgets = result.result;
PostLoadW3cWidgets.setList(widgets);
- jQuery.each(widgets, function() {
+ $.each(widgets, function(index) {
$('#w3cwidgetsList')
.append(
$("<li/>")
@@ -190,7 +189,7 @@
.css('width','50%')
.append(
$("<div/>")
-
.attr("id", "w3cImageHolder"+i)
+
.attr("id", "w3cImageHolder"+index)
)
.append(
$("<div/>")
@@ -200,8 +199,8 @@
$("<button/>")
.addClass("btn btn-small btn-primary")
.attr("id", this.url)
-
.click(function(){updateRaveMetadata(i)})
-
.text(rave.getClientMessage("get.metadata"))
+
.click(function(){updateRaveMetadata(index)})
+
.text(ui.getClientMessage("get.metadata"))
)
)
)
@@ -237,7 +236,7 @@
)
// add the thumbnail image if found
if(this.thumbnailUrl!=null){
- $('#w3cImageHolder'+i)
+ $('#w3cImageHolder'+index)
.append(
$("<img/>")
.addClass("storeWidgetThumbnail")
@@ -248,7 +247,6 @@
.attr("height", "80")
)
}
- i++;
});
$("#w3cBrowseForm").dialog("open");
}
@@ -272,7 +270,7 @@
function updateRaveMetadata(id){
if(id != null){
- widget = PostLoadW3cWidgets.getListItemByIndex(id);
+ var widget = PostLoadW3cWidgets.getListItemByIndex(id);
$('#title').val(widget.title);
$('#description').val(widget.description);
$('#thumbnailUrl').val(widget.thumbnailUrl);
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=1497900&r1=1497899&r2=1497900&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
Fri Jun 28 19:49:07 2013
@@ -450,6 +450,8 @@
$('#moveWidgetToPageButton').click(function(){
ui.layout.moveWidgetToPage($('#moveWidgetModal').data('regionWidgetId'));
})
+
+ rave.renderWidgets('home');
});
rave.setDefaultView('home');
@@ -467,10 +469,6 @@
<portal:person id="${members.userId}" var="member"/>
ui.models.currentPage.addInitData('${member.id}',
${members.editor})
</c:forEach>
-
- $(function () {
- rave.renderWidgets('home');
- });
});
</script>
</portal:register-init-script>
\ No newline at end of file
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Fri Jun 28 19:49:07 2013
@@ -237,18 +237,18 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["rave", "ui", "portal/rave_person_profile", "jquery"],
- function (rave, ui, ravePersonProfile, $) {
+ require(["rave", "ui", "portal/rave_person_profile"],
+ function (rave, ui, ravePersonProfile) {
rave.setDefaultView('profile');
rave.setOwner({
username: "<c:out value="${userProfile.username}"/>",
id: "<c:out value="${userProfile.id}"/>"
});
- $(function () {
+ rave.registerOnInitHandler(function () {
ui.forms.validateEditAccountForm();
rave.renderWidgets('home');
- });
+ })
})
</script>
</portal:register-init-script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
Fri Jun 28 19:49:07 2013
@@ -337,11 +337,9 @@
var element = $(this);
ui.displayUsersOfWidget(element.data('widget-id'));
});
- })
- $(function () {
raveStore.init('<c:out value="${referringPageId}"/>');
- });
+ })
})
</script>
</portal:register-init-script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
Fri Jun 28 19:49:07 2013
@@ -281,20 +281,16 @@
var element = $(this);
var widgetId = element.data('widget-id');
var pageId = element.data('page-id');
- rave.api.addWidgetToPage({widgetId: widgetId, pageId:
pageId, redirectAfterAdd: true, successCallback: addWidgetToPageCallback})
+ rave.api.rpc.addWidgetToPage({widgetId: widgetId, pageId:
pageId, redirectAfterAdd: true, successCallback: addWidgetToPageCallback})
})
$('#displayUsersOfWidgetLink').click(function(){
ui.displayUsersOfWidget($(this).data('widget-id'))
})
- })
- $(function () {
raveStore.init('<c:out value="${referringPageId}"/>');
raveStore.initTags("<c:out value="${widget.id}"/>");
- });
-
-
+ })
})
</script>
</portal:register-init-script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
Fri Jun 28 19:49:07 2013
@@ -32,7 +32,8 @@
<fmt:message key="page.widget.title"/>
</h2>
<br/>
- <span id="widget-0-title"><fmt:message
key="page.widget.marketplace.showdetail.notavailable"/></span>
+ <span id="widget-0-title"><fmt:message
+
key="page.widget.marketplace.showdetail.notavailable"/></span>
</div>
</div>
</div>
@@ -40,89 +41,91 @@
</div>
</div>
</c:when>
-<c:otherwise>
-<rave:navbar pageTitle="${widget.title}"/>
-<div id="na_content" class="container">
- <div class="row detail-widget storeItem">
- <div class="span3">
- <div class="detail-widget-preview">
- <c:if test="${not empty widget.screenshotUrl}">
- <div class="detailWidgetScreenshot">
- <img src="${widget.screenshotUrl}"
- alt="<fmt:message key="page.general.screenshot"/>"
- title="<c:out value="${widget.title}"/>
<fmt:message key="page.general.screenshot"/>"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.thumbnailUrl}">
- <div >
- <img src="<c:out value="${widget.thumbnailUrl}"/>"
title="<c:out value="${widget.title}"/>"
- alt="<fmt:message
key="page.general.thumbnail"/>"/>
- </div>
- </c:if>
+ <c:otherwise>
+ <rave:navbar pageTitle="${widget.title}"/>
+ <div id="na_content" class="container">
+ <div class="row detail-widget storeItem">
+ <div class="span3">
+ <div class="detail-widget-preview">
+ <c:if test="${not empty widget.screenshotUrl}">
+ <div class="detailWidgetScreenshot">
+ <img src="${widget.screenshotUrl}"
+ alt="<fmt:message
key="page.general.screenshot"/>"
+ title="<c:out value="${widget.title}"/>
<fmt:message key="page.general.screenshot"/>"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.thumbnailUrl}">
+ <div>
+ <img src="<c:out
value="${widget.thumbnailUrl}"/>"
+ title="<c:out value="${widget.title}"/>"
+ alt="<fmt:message
key="page.general.thumbnail"/>"/>
+ </div>
+ </c:if>
<div id="widgetAdded_${widget.id}"
class="detailWidgetAdd">
- <button class="btn btn-primary btn-large
storeItemButton" id="widgetMarketplaceConfirmAddButton"
- data-widget-url="<c:out
value='${widget.url}'/>" data-widget-type="<c:out value='${widget.type}'/>">
- <fmt:message
key="page.widget.marketplace.addToStore"/>
+ <button class="btn btn-primary btn-large
storeItemButton"
+ id="widgetMarketplaceConfirmAddButton"
+ data-widget-url="<c:out
value='${widget.url}'/>"
+ data-widget-type="<c:out
value='${widget.type}'/>">
+ <fmt:message
key="page.widget.marketplace.addToStore"/>
</button>
</div>
- </div>
- </div>
- <div class="span8 detail-widget-main">
- <div>
- <h2>
- <c:set var="widgetHasTitleUrl"
value="${not empty widget.titleUrl}"/>
- <c:if test="${widgetHasTitleUrl}"><a
href="<c:out value="${widget.titleUrl}"/>" rel="external">
- </c:if>
- <span
id="widget-${widget.id}-title"><c:out value="${widget.title}"/></span>
- <c:if
test="${widgetHasTitleUrl}"></a></c:if>
- </h2>
- <c:if test="${widget.disableRendering}">
- <div class="storeWidgetDisabled">
+ </div>
+ </div>
+ <div class="span8 detail-widget-main">
+ <div>
+ <h2>
+ <c:set var="widgetHasTitleUrl" value="${not empty
widget.titleUrl}"/>
+ <c:if test="${widgetHasTitleUrl}"><a href="<c:out
value="${widget.titleUrl}"/>"
+
rel="external">
+ </c:if>
+ <span id="widget-${widget.id}-title"><c:out
value="${widget.title}"/></span>
+ <c:if test="${widgetHasTitleUrl}"></a></c:if>
+ </h2>
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
<span class="widget-disabled-icon-store ui-icon
ui-icon-alert"
title="<fmt:message
key="widget.chrome.disabled"/>"></span>
- <c:out value="${widget.disableRenderingMessage}"
escapeXml="true"/>
- </div>
- </c:if>
- <c:if test="${not empty widget.author}">
- <p class="storeWidgetAuthor">
- <fmt:message key="widget.author"/>
- <c:out value=" "/><%-- intentional empty String in the
c:out --%>
- <c:choose>
- <c:when test="${not empty widget.authorEmail}">
- <a href="mailto:<c:out
value="${widget.authorEmail}"/>"><c:out
- value="${widget.author}"/></a>
- </c:when>
- <c:otherwise><c:out
value="${widget.author}"/></c:otherwise>
- </c:choose>
- </p>
- </c:if>
+ <c:out
value="${widget.disableRenderingMessage}" escapeXml="true"/>
+ </div>
+ </c:if>
+ <c:if test="${not empty widget.author}">
+ <p class="storeWidgetAuthor">
+ <fmt:message key="widget.author"/>
+ <c:out value=" "/><%-- intentional empty
String in the c:out --%>
+ <c:choose>
+ <c:when test="${not empty
widget.authorEmail}">
+ <a href="mailto:<c:out
value="${widget.authorEmail}"/>"><c:out
+ value="${widget.author}"/></a>
+ </c:when>
+ <c:otherwise><c:out
value="${widget.author}"/></c:otherwise>
+ </c:choose>
+ </p>
+ </c:if>
- <c:if test="${not empty widget.description}">
- <p class="storeWidgetDesc"><c:out
value="${widget.description}"/></p>
- </c:if>
- </div>
+ <c:if test="${not empty widget.description}">
+ <p class="storeWidgetDesc"><c:out
value="${widget.description}"/></p>
+ </c:if>
+ </div>
+ </div>
+ </div>
</div>
- </div>
-</div>
-<portal:register-init-script location="${'AFTER_RAVE'}">
- <script>
- require(["rave", "portal/rave_store", "jquery"],
- function(rave, raveStore, raveEventBindings, $){
- rave.registerOnInitHandler(function(){
-
$('#widgetMarketplaceConfirmAddButton').click(function(){
- var element = $(this);
-
raveStore.confirmAddFromMarketplace(element.data('widget-url'),
element.data('widget-type'));
- })
- })
+ <portal:register-init-script location="${'AFTER_RAVE'}">
+ <script>
+ require(["rave", "portal/rave_store", "jquery"],
+ function (rave, raveStore, raveEventBindings, $) {
+ rave.registerOnInitHandler(function () {
+
$('#widgetMarketplaceConfirmAddButton').click(function () {
+ var element = $(this);
+
raveStore.confirmAddFromMarketplace(element.data('widget-url'),
element.data('widget-type'));
+ })
- $(function () {
- raveStore.init('<c:out value="${referringPageId}"/>');
- raveStore.initTags("<c:out value="${widget.id}"/>");
- });
- })
- </script>
-</portal:register-init-script>
-</c:otherwise>
+ raveStore.init('<c:out
value="${referringPageId}"/>');
+ raveStore.initTags("<c:out
value="${widget.id}"/>");
+ })
+ })
+ </script>
+ </portal:register-init-script>
+ </c:otherwise>
</c:choose>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
Fri Jun 28 19:49:07 2013
@@ -450,10 +450,10 @@ define(['underscore', 'core/rave_ajax',
case "NO_ERROR" :
break;
case "INVALID_PARAMS":
-
alert(ravePortal.getClientMessage("api.rpc.error.invalid_params"));
+ alert(rpcResult);
break;
case "INTERNAL_ERROR":
-
alert(ravePortal.getClientMessage("api.rpc.error.internal"));
+ alert(rpcResult);
break;
}
}
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js
Fri Jun 28 19:49:07 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-define(["underscore", "portal/rave_backbone", "rave"], function(_,
raveBackbone, rave){
+define(["underscore", "portal/rave_backbone", "portal/rave_portal", "rave"],
function(_, raveBackbone, ravePortal, rave){
/*
User model. Further implementation pending.
*/
Modified:
rave/branches/require/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java?rev=1497900&r1=1497899&r2=1497900&view=diff
==============================================================================
---
rave/branches/require/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java
(original)
+++
rave/branches/require/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetWrapperRenderer.java
Fri Jun 28 19:49:07 2013
@@ -65,7 +65,7 @@ public class W3cWidgetWrapperRenderer im
* The script block template
*/
private static final String SCRIPT_BLOCK =
- "<script>rave.registerWidget(%1$s, {type: '%2$s'," +
+ "<script>require(['rave'], function(rave){rave.registerWidget('%1$s',
{type: '%2$s'," +
" regionWidgetId: %3$s," +
" widgetUrl: '%4$s', " +
" height: '%5$s', " +
@@ -75,7 +75,7 @@ public class W3cWidgetWrapperRenderer im
" locked: %9$s, " +
" hideChrome: %10$s, " +
" subPage: {id: %11$s, name: '%12$s', isDefault: %13$s}" +
- "});</script>";
+ "})});</script>";
private static final String MARKUP = "<!-- RegionWidget %1$s placeholder
-->";
