svn commit: r1326088 - in /rave/trunk/rave-portal-resources/src: main/webapp/script/rave_opensocial.js test/javascript/raveOpenSocialSpec.js

[mf...@apache.org]

Author: mfranklin
Date: Sat Apr 14 11:40:12 2012
New Revision: 1326088

URL: http://svn.apache.org/viewvc?rev=1326088&view=rev
Log:
Fixed function name change for activeGadgeHolder (RAVE-560)

Modified:
    rave/trunk/rave-portal-resources/src/main/webapp/script/rave_opensocial.js
    rave/trunk/rave-portal-resources/src/test/javascript/raveOpenSocialSpec.js

Modified: rave/trunk/rave-portal-resources/src/main/webapp/script/rave_opensocial.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_opensocial.js?rev=1326088&r1=1326087&r2=1326088&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/script/rave_opensocial.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/script/rave_opensocial.js Sat Apr 14 11:40:12 2012
@@ -199,18 +199,18 @@ rave.opensocial = rave.opensocial || (fu
     }
 
     /**
-     * Returns the Common Container activeGadgetHolder object for the given widgetId
+     * Returns the Common Container activeSiteHolder object for the given widgetId
      * @param widgetId the widgetId
      */ 
-    function getActiveGadgetHolderByWidgetId(widgetId) {
-        return rave.getRegionWidgetById(widgetId).site.getActiveGadgetHolder();     
+    function getActiveSiteHolderByWidgetId(widgetId) {
+        return rave.getRegionWidgetById(widgetId).site.getActiveSiteHolder();
     }
 
     /**
      * Returns the iframe element of the gadget for the given widgetId
      */
     function getGadgetIframeByWidgetId(widgetId) {
-        return getActiveGadgetHolderByWidgetId(widgetId).getIframeElement();     
+        return getActiveSiteHolderByWidgetId(widgetId).getIframeElement();
     }        
 
     /**
@@ -247,7 +247,7 @@ rave.opensocial = rave.opensocial || (fu
     function getCurrentView(regionWidgetId) {
         // the active gadget holder will be null if the gadget is collapsed
         // as it won't be rendered on the page
-        var activeGadgetHolder = getActiveGadgetHolderByWidgetId(regionWidgetId);
+        var activeGadgetHolder = getActiveSiteHolderByWidgetId(regionWidgetId);
         return (activeGadgetHolder == null) ? null : activeGadgetHolder.getView();
     }
 
@@ -276,7 +276,7 @@ rave.opensocial = rave.opensocial || (fu
         //to retrieve the module ID
         //A patch should be submitted to Shindig's common container code to properly
         //set the iFrame ID to the module id
-        var bodyId = args.gs.getActiveGadgetHolder().getElement().id;
+        var bodyId = args.gs.getActiveSiteHolder().getElement().id;
         var titleId = "widget-" + rave.getObjectIdFromDomId(bodyId) + "-title";
         var element = document.getElementById(titleId);
         if (element) {
@@ -295,7 +295,7 @@ rave.opensocial = rave.opensocial || (fu
      * @param prefValue the userpref value
      */ 
     function setPref(args, editToken, prefName, prefValue) {        
-        var widgetId = rave.getObjectIdFromDomId(args.gs.getActiveGadgetHolder().getElement().id);                               
+        var widgetId = rave.getObjectIdFromDomId(args.gs.getActiveSiteHolder().getElement().id);
         var regionWidget = rave.getRegionWidgetById(widgetId);
         // update the memory prefs object
         regionWidget.userPrefs[prefName] = prefValue;
@@ -310,7 +310,7 @@ rave.opensocial = rave.opensocial || (fu
      * @param viewName the view name to render
      */
     function requestNavigateTo(args, viewName) {       
-        var widgetId = rave.getObjectIdFromDomId(args.gs.getActiveGadgetHolder().getElement().id);
+        var widgetId = rave.getObjectIdFromDomId(args.gs.getActiveSiteHolder().getElement().id);
         var fnArgs = {};
         fnArgs.data = {}
         fnArgs.data.id = widgetId;

Modified: rave/trunk/rave-portal-resources/src/test/javascript/raveOpenSocialSpec.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/test/javascript/raveOpenSocialSpec.js?rev=1326088&r1=1326087&r2=1326088&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/test/javascript/raveOpenSocialSpec.js (original)
+++ rave/trunk/rave-portal-resources/src/test/javascript/raveOpenSocialSpec.js Sat Apr 14 11:40:12 2012
@@ -114,7 +114,7 @@ describe("Rave OpenSocial", function() {
                 f : "frameId",
                 a : arrayOut ? ["TITLE"] : "TITLE",
                 gs : {
-                    getActiveGadgetHolder : function() {
+                    getActiveSiteHolder : function() {
                         return {getElement : function() {
                             return { id : id }
                         }}
@@ -141,7 +141,7 @@ describe("Rave OpenSocial", function() {
             return {
                 f : "frameId",               
                 gs : {
-                    getActiveGadgetHolder : function() {
+                    getActiveSiteHolder : function() {
                         return {getElement : function() {
                             return { id : id }
                         }}