You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/09/14 03:12:03 UTC
svn commit: r1523171 - in
/rave/trunk/rave-portal-resources/src/main/webapp/static/script:
core/rave_opensocial.js portal/rave_ui.js
Author: mfranklin
Date: Sat Sep 14 01:12:03 2013
New Revision: 1523171
URL: http://svn.apache.org/r1523171
Log:
Changed gadget to widget in paths (RAVE-1056)
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js?rev=1523171&r1=1523170&r2=1523171&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js Sat Sep 14 01:12:03 2013
@@ -119,7 +119,7 @@ define(['underscore', 'core/rave_view_ma
container.actions.registerShowActionsHandler(function(actions) {
_.each(actions, function(action){
//TODO: There is a bug in the shindig code where the action is assumed to launch a new gadget. This works around the issue
- actionManager.createAction(action.id, action.label, action.path, action.moduleId, action.icon, action.tooltip, function() {
+ actionManager.createAction(action.id, action.label, action.path.replace("gadget", "widget"), action.moduleId, action.icon, action.tooltip, function() {
var site = siteByWidgetId[action.moduleId];
var holder = site.getActiveSiteHolder();
if (holder) {
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js?rev=1523171&r1=1523170&r2=1523171&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/portal/rave_ui.js Sat Sep 14 01:12:03 2013
@@ -987,7 +987,7 @@ define(["jquery", "underscore", "rave",
if(!actions[id]) {
var segments = path.split("/");
//TODO Implement more paths and a better path routing system
- if (segments.length === 2 && segments[0] === "gadget" && segments[1] === "toolbar") {
+ if (segments.length === 2 && segments[0] === "widget" && segments[1] === "toolbar") {
actions[id] = insertWidgetToolbarAction(widgetId, label, image, tooltip, id, onSelected);
} else {
rave.log("Unsupported action path: '" + path + "'")