svn commit: r1515402 - in /rave/trunk: rave-portal-resources/src/main/webapp/static/script/core/ rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/

[mfranklin]

Author: mfranklin
Date: Mon Aug 19 13:20:48 2013
New Revision: 1515402

URL: http://svn.apache.org/r1515402
Log:
Updated render params for OpenSocial provider to respect debug flag (RAVE-1042)

Modified:
    
rave/trunk/rave-portal-resources/src/main/webapp/static/script/core/rave_opensocial.js
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java

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=1515402&r1=1515401&r2=1515402&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 Aug 19 13:20:48 2013
@@ -200,10 +200,10 @@ define(['underscore', 'core/rave_view_ma
             var renderParams = {};
             renderParams[osapi.container.RenderParam.VIEW] = opts.view || 
stateManager.getDefaultView();
             renderParams[osapi.container.RenderParam.ALLOW_DEFAULT_VIEW ] = 
opts.allowDefaultView;
-            renderParams[osapi.container.RenderParam.DEBUG ] = opts.debug;
+            renderParams[osapi.container.RenderParam.DEBUG ] = opts.debug || 
stateManager.getDebugMode();
             renderParams[osapi.container.RenderParam.HEIGHT ] = 
getHeightFromParams(opts);
-            renderParams[osapi.container.RenderParam.NO_CACHE ] = opts.noCache;
-            renderParams[osapi.container.RenderParam.TEST_MODE] = 
opts.testMode;
+            renderParams[osapi.container.RenderParam.NO_CACHE ] = opts.noCache 
|| stateManager.getDebugMode();
+            renderParams[osapi.container.RenderParam.TEST_MODE] = 
opts.testMode || stateManager.getDebugMode();
             renderParams[osapi.container.RenderParam.WIDTH ] = 
getWidthFromParams(opts);
             renderParams[osapi.container.RenderParam.USER_PREFS] = 
getCompleteUserPrefSet(widget.userPrefs, widget.metadata.userPrefs);
             container.navigateGadget(site, widget.widgetUrl, opts.view_params, 
renderParams, opts.callback);

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java?rev=1515402&r1=1515401&r2=1515402&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/config/OpenSocialEnvironment.java
 Mon Aug 19 13:20:48 2013
@@ -45,7 +45,7 @@ public class OpenSocialEnvironment imple
 
     private static final String CONTAINER_JS_KEY = "containerJs";
     private static final String SCRIPT_RENDER_DEBUG_ON = "1";
-    private final static String SCRIPT_TEMPLATE = 
"<script>requirejs.config({paths: 
{\"osapi\":\"%1$s://%2$s%3$s/js/%4$s.js?c=1&amp;container=default&amp;debug=%5$s\"}});</script>";
+    private final static String SCRIPT_TEMPLATE = 
"<script>requirejs.config({paths: 
{\"osapi\":\"%1$s://%2$s%3$s/js/%4$s.js?c=1&container=default&debug=%5$s\"}});</script>";
 
     private String currentDebugMode;