svn commit: r1497573 - in /rave/branches/require/rave-portal-resources/src/main/webapp: WEB-INF/jsp/views/page.jsp WEB-INF/tags/rave_js.tag static/script/core/rave_opensocial.js static/script/core/rave_state_manager.js

[erinnp]

Author: erinnp
Date: Thu Jun 27 21:41:39 2013
New Revision: 1497573

URL: http://svn.apache.org/r1497573
Log:
re-enable js debug mode for gadget rendering, wrap id's in quotes on setPage 
call to support mongodb correctly

Modified:
    
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/tags/rave_js.tag
    
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/core/rave_state_manager.js

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=1497573&r1=1497572&r2=1497573&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
 Thu Jun 27 21:41:39 2013
@@ -453,7 +453,11 @@
             });
 
             rave.setDefaultView('home');
-            rave.setPage({id: ${page.id}, ownerId: ${page.ownerId}, viewerId: 
<sec:authentication property="principal.id" />});
+            rave.setPage({
+                id: "${page.id}",
+                ownerId: "${page.ownerId}", viewerId:
+                "<sec:authentication property="principal.id" />"
+            });
             rave.getViewer().editor =<c:out value="${pageUser.editor}"/>;
             
rave.setExportEnabled(${applicationProperties['portal.export.ui.enable']});
 

Modified: 
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL: 
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1497573&r1=1497572&r2=1497573&view=diff
==============================================================================
--- 
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
 (original)
+++ 
rave/branches/require/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
 Thu Jun 27 21:41:39 2013
@@ -58,8 +58,7 @@
             rave.init();
         });
 
-        <%-- set the javascript debug mode so js code has access to it --%>
-        <%--ui.setJavaScriptDebugMode(<c:out value="${jsDebugMode}"/>);--%>
+        rave.setDebugMode(<c:out value="${jsDebugMode}"/>);
     });
 </script>
 <portal:render-script location="${'AFTER_RAVE'}"/>

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=1497573&r1=1497572&r2=1497573&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
 Thu Jun 27 21:41:39 2013
@@ -25,8 +25,7 @@ define(['underscore', 'core/rave_view_ma
 
         var containerConfig = {};
         containerConfig[osapi.container.ServiceConfig.API_PATH] = "/rpc";
-        //TODO: Handle moving out javaScriptDebugMode
-        //containerConfig[osapi.container.ContainerConfig.RENDER_DEBUG] = 
ravePortal.getJavaScriptDebugMode();
+        containerConfig[osapi.container.ContainerConfig.RENDER_DEBUG] = 
stateManager.getDebugMode();
         container = new osapi.container.Container(containerConfig);
 
         gadgets.pubsub2router.init({

Modified: 
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_state_manager.js
URL: 
http://svn.apache.org/viewvc/rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_state_manager.js?rev=1497573&r1=1497572&r2=1497573&view=diff
==============================================================================
--- 
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_state_manager.js
 (original)
+++ 
rave/branches/require/rave-portal-resources/src/main/webapp/static/script/core/rave_state_manager.js
 Thu Jun 27 21:41:39 2013
@@ -26,7 +26,8 @@ define([], function () {
         exportEnabled,
         defaultHeight = 200,
         defaultWidth = 320,
-        defaultView = 'default';
+        defaultView = 'default',
+        debugMode = false;
 
     var exports = {};
 
@@ -94,6 +95,14 @@ define([], function () {
         return defaultView;
     }
 
+    exports.setDebugMode = function(b) {
+        debugMode = b;
+    }
+
+    exports.getDebugMode = function(){
+        return debugMode;
+    }
+
     return exports;
 
 });