Centralize condition for requiring landscape.

See #7026 (comment)
code-dot-org · Feb 29, 2016 · db265b2 · db265b2
1 parent 500435e
commit db265b2
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 18 deletions.
diff --git a/apps/src/applab/applab.js b/apps/src/applab/applab.js
@@ -868,7 +868,8 @@ Applab.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/bounce/bounce.js b/apps/src/bounce/bounce.js
@@ -807,7 +807,8 @@ Bounce.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/calc/calc.js b/apps/src/calc/calc.js
@@ -229,7 +229,8 @@ Calc.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: studioApp.init.bind(studioApp, config)

diff --git a/apps/src/craft/craft.js b/apps/src/craft/craft.js
@@ -336,7 +336,8 @@ Craft.init = function (config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/eval/eval.js b/apps/src/eval/eval.js
@@ -175,7 +175,8 @@ Eval.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: studioApp.init.bind(studioApp, config)

diff --git a/apps/src/flappy/flappy.js b/apps/src/flappy/flappy.js
@@ -609,7 +609,8 @@ Flappy.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/gamelab/GameLab.js b/apps/src/gamelab/GameLab.js
@@ -156,7 +156,8 @@ GameLab.prototype.init = function (config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: this.studioApp_.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/jigsaw/jigsaw.js b/apps/src/jigsaw/jigsaw.js
@@ -188,7 +188,8 @@ Jigsaw.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/maze/maze.js b/apps/src/maze/maze.js
@@ -646,7 +646,8 @@ Maze.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: studioApp.init.bind(studioApp, config)

diff --git a/apps/src/netsim/NetSimView.jsx b/apps/src/netsim/NetSimView.jsx
@@ -9,7 +9,8 @@ var StudioAppWrapper = require('../templates/StudioAppWrapper.jsx');
 var NetSimView = React.createClass({
   propTypes: {
     assetUrl: React.PropTypes.func.isRequired,
-    requireLandscape: React.PropTypes.bool.isRequired,
+    isEmbedView: React.PropTypes.bool.isRequired,
+    isShareView: React.PropTypes.bool.isRequired,
     renderCodeApp: React.PropTypes.func.isRequired,
     onMount: React.PropTypes.func.isRequired
   },
@@ -22,7 +23,8 @@ var NetSimView = React.createClass({
     return (
       <StudioAppWrapper
           assetUrl={this.props.assetUrl}
-          requireLandscape={this.props.requireLandscape}>
+          isEmbedView={this.props.isEmbedView}
+          isShareView={this.props.isShareView}>
         <ProtectedStatefulDiv renderContents={this.props.renderCodeApp} />
       </StudioAppWrapper>
     );

diff --git a/apps/src/netsim/netsim.js b/apps/src/netsim/netsim.js
@@ -259,7 +259,8 @@ NetSim.prototype.init = function(config) {
 
   React.render(React.createElement(NetSimView, {
     assetUrl: this.studioApp_.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeApp: renderCodeApp,
     onMount: onMount
   }), document.getElementById(config.containerId));

diff --git a/apps/src/studio/studio.js b/apps/src/studio/studio.js
@@ -2007,7 +2007,8 @@ Studio.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: studioApp.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: onMount

diff --git a/apps/src/templates/AppView.jsx b/apps/src/templates/AppView.jsx
@@ -9,7 +9,8 @@ var StudioAppWrapper = require('../templates/StudioAppWrapper.jsx');
 var AppView = React.createClass({
   propTypes: {
     assetUrl: React.PropTypes.func.isRequired,
-    requireLandscape: React.PropTypes.bool.isRequired,
+    isEmbedView: React.PropTypes.bool.isRequired,
+    isShareView: React.PropTypes.bool.isRequired,
     renderCodeWorkspace: React.PropTypes.func.isRequired,
     renderVisualizationColumn: React.PropTypes.func.isRequired,
     onMount: React.PropTypes.func.isRequired
@@ -23,7 +24,8 @@ var AppView = React.createClass({
     return (
       <StudioAppWrapper
           assetUrl={this.props.assetUrl}
-          requireLandscape={this.props.requireLandscape}>
+          isEmbedView={this.props.isEmbedView}
+          isShareView={this.props.isShareView}>
         <ProtectedStatefulDiv
             id="visualizationColumn"
             renderContents={this.props.renderVisualizationColumn} />

diff --git a/apps/src/templates/StudioAppWrapper.jsx b/apps/src/templates/StudioAppWrapper.jsx
@@ -10,13 +10,18 @@ var RotateContainer = require('../templates/RotateContainer.jsx');
 var StudioAppWrapper = React.createClass({
   propTypes: {
     assetUrl: React.PropTypes.func.isRequired,
-    requireLandscape: React.PropTypes.bool.isRequired
+    isEmbedView: React.PropTypes.bool.isRequired,
+    isShareView: React.PropTypes.bool.isRequired
+  },
+
+  requiresLandscape: function () {
+    return !(this.props.isEmbedView || this.props.isShareView);
   },
 
   render: function () {
     return (
       <div>
-        {this.props.requireLandscape && <RotateContainer assetUrl={this.props.assetUrl} />}
+        {this.requiresLandscape() && <RotateContainer assetUrl={this.props.assetUrl} />}
         {this.props.children}
         <div className="clear"></div>
       </div>

diff --git a/apps/src/turtle/turtle.js b/apps/src/turtle/turtle.js
@@ -235,7 +235,8 @@ Artist.prototype.init = function(config) {
 
   React.render(React.createElement(AppView, {
     assetUrl: this.studioApp_.assetUrl,
-    requireLandscape: !(config.share || config.embed),
+    isEmbedView: !!config.embed,
+    isShareView: !!config.share,
     renderCodeWorkspace: renderCodeWorkspace,
     renderVisualizationColumn: renderVisualizationColumn,
     onMount: this.studioApp_.init.bind(this.studioApp_, config)