Author: erinnp
Date: Tue Jun 25 18:01:16 2013
New Revision: 1496565
URL: http://svn.apache.org/r1496565
Log:
remove event bindings file
Removed:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_event_bindings.js
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.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/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_opensocial.js
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/main.js
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/rave_models.js
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.jsp
Tue Jun 25 18:01:16 2013
@@ -131,14 +131,39 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(['ui', "jquery"], function(ui, $){
+ require(['ui', 'rave', "jquery"], function(ui, rave, $){
+ rave.registerOnInitHandler(function(){
+ $('#fetchMetadataButton').click(function(){
+ rave.api.rpc.getWidgetMetadata({
+ url: $('#url').get(0).value,
+ providerType: 'OpenSocial',
+ successCallback: function(result) {
+ var widget = result.result;
+ $('#title').val(widget.title);
+ $('#description').val(widget.description);
+ $('#thumbnailUrl').val(widget.thumbnailUrl);
+ $('#screenshotUrl').val(widget.screenshotUrl);
+ $('#titleUrl').val(widget.titleUrl);
+ $('#author').val(widget.author);
+ $('#authorEmail').val(widget.authorEmail);
+ $('#addWidgetForm').show();
+ $('#addWidgetFormSubmit').show();
+ },
+ errorCallback: function(){
+
alert(ui.getClientMessage("api.widget_metadata.parse_error"));
+ },
+ alertInvalidParams: function(){
+
alert(ui.getClientMessage("api.widget_metadata.invalid_params"));
+ }
+ })
+ })
+ })
+
$(function() {
if ($('#url').val().length === 0) {
$('#addWidgetForm').hide();
$('#addWidgetFormSubmit').hide();
}
-
- ui.bindEvents('addWidget.jsp');
})});
</script>
</portal:register-init-script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/addwidget.marketplace.jsp
Tue Jun 25 18:01:16 2013
@@ -243,10 +243,15 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["portal/rave_store", "ui", "jquery"], function(raveStore, ui,
$){
+ require(["portal/rave_store", "rave", "jquery"], function(raveStore,
rave, $){
+ rave.registerOnInitHandler(function(){
+ $("#marketplaceWidgetList").on("click",
"button.widgetAddButton", function(event){
+
raveStore.confirmAddFromMarketplace($(this).data('widget-url'),
$(this).data('widget-type'));
+ });
+ })
+
$(function () {
raveStore.init('<c:out value="${referringPageId}"/>');
- ui.bindEvents("addwidget.marketplace.jsp")
});
})
</script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/widgetdetail.jsp
Tue Jun 25 18:01:16 2013
@@ -264,12 +264,35 @@
</div>
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["portal/rave_admin", "portal/rave_event_bindings", "jquery"],
function(raveAdmin, raveEventBindings, $){
+ require(["rave", "ui", "portal/rave_admin", "jquery"], function(rave,
ui, raveAdmin, $){
+ rave.registerOnInitHandler(function(){
+ $('#fetchMetadataButton').click(function(){
+ rave.api.rpc.getWidgetMetadata({
+ url: $('#url').get(0).value,
+ providerType:
$('input:radio[name=type]:checked').val(),
+ successCallback: function(result) {
+ var widget = result.result;
+ $('#title').val(widget.title);
+ $('#description').val(widget.description);
+ $('#thumbnailUrl').val(widget.thumbnailUrl);
+ $('#screenshotUrl').val(widget.screenshotUrl);
+ $('#titleUrl').val(widget.titleUrl);
+ $('#author').val(widget.author);
+ $('#authorEmail').val(widget.authorEmail);
+ },
+ errorCallback: function(){
+
alert(ui.getClientMessage("api.widget_metadata.parse_error"));
+ },
+ alertInvalidParams: function(){
+
alert(ui.getClientMessage("api.widget_metadata.invalid_params"));
+ }
+ })
+ })
+ })
+
$(function() {
raveAdmin.init();
-
- raveEventBindings.bindEvents('widgetdetail.jsp');
});
})
</script>
-</portal:register-init-script>
\ No newline at end of file
+</portal:register-init-script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/error.jsp
Tue Jun 25 18:01:16 2013
@@ -69,8 +69,16 @@ and use it as the default error page for
<script>
- require(["ui", "jquery"], function(ui, $){
- $(function(){ui.bindEvents('error.jsp')});
+ require(["rave", "jquery"], function(rave, $){
+ rave.registerOnInitHandler(function(){
+ $("#showErrorStack").click(function(){
+ document.getElementById('errorStack').style.display =
'block';
+ })
+
+ $("#hideErrorStack").click(function(){
+ document.getElementById('errorStack').style.display =
'none';
+ })
+ })
})
</script>
</tiles:putAttribute>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Tue Jun 25 18:01:16 2013
@@ -142,12 +142,18 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["rave", "ui", "jquery"], function(rave, ui, $){
+ require(["rave", "jquery"], function(rave, $){
+ rave.registerOnInitHandler(function(){
+ $("#pageContent").on("click", ".widget-title-bar-mobile",
function(event){
+ //TODO:This function is undefined, must re-define before
un-commenting out
+ //rave.toggleMobileWidget($(this).data('regionWidget-id'));
+ console.log("rave.toggleMobileWidget function is
undefined");
+ });
+ });
+
$(function() {
rave.getViewer().editor =<c:out value="${pageUser.editor}"/>;
-
- ui.bindEvents('mobile_home.jsp');
});
})
</script>
-</portal:register-init-script>
\ No newline at end of file
+</portal:register-init-script>
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=1496565&r1=1496564&r2=1496565&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
Tue Jun 25 18:01:16 2013
@@ -434,6 +434,24 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
require(["rave", "ui", 'jquery'], function (rave, ui, $) {
+ rave.registerOnInitHandler(function(){
+ $('#acceptShareLink').click(function(){
+ ui.models.currentPage.acceptShare();
+ });
+
+ $('#declineShareLink').click(function(){
+ ui.models.currentPage.declineShare();
+ });
+
+ $('#movePageButton').click(function(){
+ ui.models.movePage();
+ })
+
+ $('#moveWidgetToPageButton').click(function(){
+
ui.layout.moveWidgetToPage($('#moveWidgetModal').data('regionWidgetId'));
+ })
+ });
+
rave.setDefaultView('home');
rave.setPage({id: ${page.id}, ownerId: ${page.ownerId}, viewerId:
<sec:authentication property="principal.id" />});
rave.getViewer().editor =<c:out value="${pageUser.editor}"/>;
@@ -447,10 +465,8 @@
</c:forEach>
$(function () {
- ui.bindEvents('page.jsp');
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/store.jsp
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1496565&r1=1496564&r2=1496565&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
Tue Jun 25 18:01:16 2013
@@ -306,13 +306,42 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["rave", "portal/rave_store", "portal/rave_event_bindings",
"jquery"],
- function(rave, raveStore, raveEventBindings, $){
- $(function () {
- raveStore.init('<c:out value="${referringPageId}"/>');
+ require(["rave", "ui", "portal/rave_store", "portal/rave_display",
"jquery"],
+ function(rave, ui, raveStore, raveDisplay, $){
+ //Helper function for callback below
+ function addWidgetToPageCallback (result){
+ var widgetTitle =
ui.getClientMessage("widget.add_prefix");
- raveEventBindings.bindEvents('store.jsp');
- });
+ if (result != undefined && result.title != undefined
&& result.title.length > 0) {
+ widgetTitle = result.title;
+ }
+ ui.showInfoMessage(widgetTitle + ' ' +
ui.getClientMessage("widget.add_suffix"));
+
+ // Update Add Widget button to reflect status
+ var addWidgetButton = "#addWidget_" + result.widgetId;
+ var addedText = '<i class="icon icon-ok
icon-white"></i> ' + $(addWidgetButton).data('success');
+
+
$(addWidgetButton).removeClass("btn-primary").addClass("btn-success").html(addedText);
+ }
+
+ rave.registerOnInitHandler(function(){
+ $("#storeItems").on("click", "button.widgetAddButton",
function(event){
+ var element = $(this);
+ rave.api.rpc.addWidgetToPage({widgetId:
element.data('widget-id'),
+ pageId: element.data('referring-page-id'),
buttonId: element.attr('id'),
+ successCallback: addWidgetToPageCallback
+ });
+ });
+
+ $("#storeItems").on("click", "a.displayUsersLink",
function(event){
+ var element = $(this);
+
raveDisplay.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=1496565&r1=1496564&r2=1496565&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
Tue Jun 25 18:01:16 2013
@@ -259,12 +259,40 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["portal/rave_store", "portal/rave_event_bindings", "jquery"],
function(raveStore, raveEventBindings, $){
+ require(["rave", "ui", "portal/rave_display", "portal/rave_store",
"jquery"], function(rave, ui, raveDisplay, raveStore, $){
+ //TODO: Ask Erin about duplicate code, put it in a module?
+ //Helper function for callback below
+ function addWidgetToPageCallback (result){
+ var widgetTitle = ui.getClientMessage("widget.add_prefix");
+
+ if (result != undefined && result.title != undefined &&
result.title.length > 0) {
+ widgetTitle = result.title;
+ }
+ ui.showInfoMessage(widgetTitle + ' ' +
ui.getClientMessage("widget.add_suffix"));
+
+ // Update Add Widget button to reflect status
+ var addWidgetButton = "#addWidget_" + result.widgetId;
+ var addedText = '<i class="icon icon-ok icon-white"></i> ' +
$(addWidgetButton).data('success');
+
+
$(addWidgetButton).removeClass("btn-primary").addClass("btn-success").html(addedText);
+ }
+
+ rave.registerOnInitHandler(function(){
+ $('.widgetJspAddWidgetButton').click(function(){
+ 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})
+ })
+
+ $('#displayUsersOfWidgetLink').click(function(){
+ raveDisplay.displayUsersOfWidget($(this).data('widget-id'))
+ })
+ })
+
$(function () {
raveStore.init('<c:out value="${referringPageId}"/>');
raveStore.initTags("<c:out value="${widget.id}"/>");
-
- raveEventBindings.bindEvents('widget.jsp');
});
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=1496565&r1=1496564&r2=1496565&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
Tue Jun 25 18:01:16 2013
@@ -108,13 +108,18 @@
<portal:register-init-script location="${'AFTER_RAVE'}">
<script>
- require(["portal/rave_store", "portal/rave_event_bindings", "jquery"],
- function(raveStore, raveEventBindings, $){
- $(function () {
- raveStore.init('<c:out value="${referringPageId}"/>');
- raveStore.initTags("<c:out value="${widget.id}"/>");
+ 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'));
+ })
+ })
- raveEventBindings.bindEvents('widget.marketplace.jsp');
+ $(function () {
+ raveStore.init('<c:out value="${referringPageId}"/>');
+ raveStore.initTags("<c:out value="${widget.id}"/>");
});
})
</script>
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
Tue Jun 25 18:01:16 2013
@@ -17,7 +17,6 @@
* under the License.
*/
-//TODO: Remove dependency on rave_ui when moving to angular
define(['underscore', 'core/rave_view_manager', 'core/rave_api',
'core/rave_openajax_hub', 'core/rave_log', 'core/rave_state_manager', 'osapi'],
function (_, viewManager, api, managedHub, log, stateManager) {
var exports = {};
@@ -62,8 +61,6 @@ define(['underscore', 'core/rave_view_ma
api.rest.getSecurityToken({
"url": widgetUrl,
- //TODO: need to remove reference to rave.ui once we
understand need for current pageid
- //violates core dependency
"pageid": stateManager.getPage().id,
"successCallback": renderEE
});
@@ -77,7 +74,6 @@ define(['underscore', 'core/rave_view_ma
"securityToken": data.securityToken,
"metadata": opt_gadgetInfo
},
- //TODO: hardcoded default height and width
height = gadget.metadata.modulePrefs.height ||
stateManager.getDefaultHeight(),
width = gadget.metadata.modulePrefs.width ||
stateManager.getDefaultWidth();
@@ -232,4 +228,4 @@ define(['underscore', 'core/rave_view_ma
}
return exports;
- })
\ No newline at end of file
+ })
Modified:
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/main.js
URL:
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/main.js?rev=1496565&r1=1496564&r2=1496565&view=diff
==============================================================================
---
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/main.js
(original)
+++
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/portal/main.js
Tue Jun 25 18:01:16 2013
@@ -17,14 +17,14 @@
* under the License.
*/
-define(['underscore', 'portal/rave_portal', 'portal/rave_event_bindings',
'portal/rave_models', 'portal/rave_ui',
+define(['underscore', 'portal/rave_portal', 'portal/rave_models',
'portal/rave_ui',
'portal/rave_layout', 'portal/rave_forms'],
- function (_, portal, eventBindings, models) {
+ function (_, portal, models, ui, layout, forms) {
- _.extend(portal, eventBindings);
portal.models = models;
+ portal.layout = layout;
return portal
}
-);
\ No newline at end of file
+);
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=1496565&r1=1496564&r2=1496565&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
Tue Jun 25 18:01:16 2013
@@ -17,8 +17,6 @@
* under the License.
*/
-//All set!!
-
define(["underscore", "portal/rave_backbone", "rave"], function(_,
raveBackbone, rave){
/*
User model. Further implementation pending.
