Merge pull request #57 from rachel-fenichel/feature/horizontal_config

Turn toolbox sideways in the horizontal playground.

Author: rachel-fenichel

core/flyout.js

@@ -60,7 +60,7 @@ Blockly.Flyout = function(workspaceOptions) {
    * Flyout should be laid out horizontally vs vertically.
    * @type {boolean}
    */
-  this.horizontalLayout_ = false;
+  this.horizontalLayout_ = workspaceOptions.horizontalLayout;
 
   /**
    * Opaque data that can be passed to Blockly.unbindEvent_.

core/inject.js

@@ -125,6 +125,10 @@ Blockly.parseOptions_ = function(options) {
     if (hasSounds === undefined) {
       hasSounds = true;
     }
+    var horizontalLayout = options['horizontalLayout'];
+    if (horizontalLayout === undefined) {
+      horizontalLayout = false;
+    }
   }
   var hasScrollbars = options['scrollbars'];
   if (hasScrollbars === undefined) {
@@ -201,6 +205,7 @@ Blockly.parseOptions_ = function(options) {
     hasTrashcan: hasTrashcan,
     hasSounds: hasSounds,
     hasCss: hasCss,
+    horizontalLayout: horizontalLayout,
     languageTree: languageTree,
     gridOptions: gridOptions,
     zoomOptions: zoomOptions,

core/toolbox.js

@@ -64,7 +64,7 @@ Blockly.Toolbox = function(workspace) {
    * @type {boolean}
    * @private
    */
-  this.horizontalLayout_ = false;
+  this.horizontalLayout_ = workspace.options.horizontalLayout;
 
   if (this.horizontalLayout_) {
     this.CONFIG_['cssTreeRow'] =
@@ -148,7 +148,8 @@ Blockly.Toolbox.prototype.init = function() {
   var workspaceOptions = {
     disabledPatternId: workspace.options.disabledPatternId,
     parentWorkspace: workspace,
-    RTL: workspace.RTL
+    RTL: workspace.RTL,
+    horizontalLayout: workspace.horizontalLayout
   };
 
   /**

core/workspace.js

@@ -43,6 +43,8 @@ Blockly.Workspace = function(opt_options) {
   this.options = opt_options || {};
   /** @type {boolean} */
   this.RTL = !!this.options.RTL;
+  /** @type {boolean} */
+  this.horizontalLayout = !!this.options.horizontalLayout;
   /** @type {!Array.<!Blockly.Block>} */
   this.topBlocks_ = [];
 };

core/workspace_svg.js

@@ -294,7 +294,8 @@ Blockly.WorkspaceSvg.prototype.addFlyout_ = function() {
   var workspaceOptions = {
     disabledPatternId: this.options.disabledPatternId,
     parentWorkspace: this,
-    RTL: this.RTL
+    RTL: this.RTL,
+    horizontalLayout: this.horizontalLayout
   };
   /** @type {Blockly.Flyout} */
   this.flyout_ = new Blockly.Flyout(workspaceOptions);

tests/horizontal_playground.html

@@ -33,6 +33,7 @@
     scrollbars: true,
     toolbox: toolbox,
     trashcan: true,
+    horizontalLayout: true,
     zoom: {
       controls: true,
       wheel: false,