Author: erinnp
Date: Mon Mar 25 20:25:13 2013
New Revision: 1460877
URL: http://svn.apache.org/r1460877
Log:
rave-918, rave-919 bug fixes for rpc calls.
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.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_api.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js?rev=1460877&r1=1460876&r2=1460877&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_api.js
Mon Mar 25 20:25:13 2013
@@ -202,7 +202,7 @@ rave.api = rave.api || (function () {
function getSecurityToken(args) {
rave.ajax({
type: 'GET',
- url: context + "api/rest/" + "st?url=" + args.url + "&pageid="
+ args.pageid,
+ url: context + "api/rest/opensocial/gadget?url=" + args.url +
"&pageid=" + args.pageid,
dataType: "json",
success: function (data) {
if (typeof args.successCallback == 'function') {
@@ -224,7 +224,8 @@ rave.api = rave.api || (function () {
deletePage: deletePage,
getUsersForWidget: getUsersForWidget,
createWidgetTag: createWidgetTag,
- getTags: getTags
+ getTags: getTags,
+ getSecurityToken: getSecurityToken
};
})();
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=1460877&r1=1460876&r2=1460877&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
Mon Mar 25 20:25:13 2013
@@ -31,18 +31,51 @@ rave.registerProvider(
containerConfig[osapi.container.ContainerConfig.RENDER_DEBUG] =
rave.getJavaScriptDebugMode();
container = new osapi.container.Container(containerConfig);
- //rpcRegister();
+ rpcRegister();
implementViews();
}
function rpcRegister() {
- container.rpcRegister('set_title', setTitle);
container.rpcRegister('requestNavigateTo', requestNavigateTo);
container.rpcRegister('set_pref', setPref);
+ container.rpcRegister('set_title', setTitle);
container.rpcRegister('hideWidget', hideWidget);
container.rpcRegister('showWidget', showWidget);
}
+ function requestNavigateTo(args, viewName, opt_params, opt_ownerId) {
+ var widget = args.gs._widget;
+ widget.render(widget._el, {view: viewName, view_params:
opt_params, ownerId: opt_ownerId});
+ }
+
+ function setPref(args, editToken, prefName, prefValue) {
+ var widget = args.gs._widget;
+ widget.savePreference(prefName, prefValue);
+ }
+
+ /*
+ TODO: these rely on a gadget's view implementing a method
+ */
+ function setTitle(args) {
+ var widget = args.gs._widget;
+ if (widget._view && widget._view.setTitle) {
+ var title = _.isArray(args.a) ? args.a[0] : args.a;
+ widget._view.setTitle(title);
+ }
+ }
+ function hideWidget(args, viewName, opt_params, opt_ownerId) {
+ var widget = args.gs._widget;
+ if (widget._view && widget._view.collapse) {
+ widget._view.collapse();
+ }
+ }
+ function showWidget(args, viewName, opt_params, opt_ownerId) {
+ var widget = args.gs._widget;
+ if (widget._view && widget._view.expand) {
+ widget._view.expand();
+ }
+ }
+
function implementViews() {
container.views.createElementForGadget = function (metadata, rel,
opt_view, opt_viewTarget, opt_coordinates, parentSite, opt_callback) {
if (opt_viewTarget) {
@@ -119,6 +152,7 @@ rave.registerProvider(
exports.renderWidget = function (widget, el, opts) {
opts = opts || {};
var site = container.newGadgetSite(el);
+ site._widget = widget;
widget._site = site;
var renderParams = {};
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js?rev=1460877&r1=1460876&r2=1460877&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_widget.js
Mon Mar 25 20:25:13 2013
@@ -57,7 +57,7 @@ rave.RegionWidget = (function () {
*/
Widget.prototype.render = function (el, opts) {
if (this.error) {
- this.view = rave.renderView('errorWidget', el, this);
+ this._view = rave.renderView('errorWidget', el, this);
return;
}
if (_.isString(el)) {
@@ -116,6 +116,11 @@ rave.RegionWidget = (function () {
});
}
+ Widget.prototype.savePreference = function(name, val) {
+ this.userPrefs[name] = val;
+ rave.api.rest.saveWidgetPreference({regionWidgetId:
this.regionWidgetId, prefName: name, prefValue: val});
+ }
+
Widget.prototype.savePreferences = function (updatedPrefs) {
this.userPrefs = updatedPrefs;
rave.api.rest.saveWidgetPreferences({regionWidgetId:
this.regionWidgetId, userPrefs: updatedPrefs});
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=1460877&r1=1460876&r2=1460877&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
Mon Mar 25 20:25:13 2013
@@ -211,6 +211,8 @@ _.extend(rave.ui, (function () {
}
function renderWidgets() {
+ rave.setDefaultGadgetView('home');
+
if (_.isEmpty(rave.getWidgets())) {
displayEmptyPageMessage();
}
