Merge pull request #4052 from rachel-fenichel/more_connection_checks

Use registry for connection checker

blockly_uncompressed.js

@@ -26,7 +26,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations']
 goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {});
 goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Ui', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {});
 goog.addDependency('../../core/block_events.js', ['Blockly.Events.BlockBase', 'Blockly.Events.BlockChange', 'Blockly.Events.BlockCreate', 'Blockly.Events.BlockDelete', 'Blockly.Events.BlockMove', 'Blockly.Events.Change', 'Blockly.Events.Create', 'Blockly.Events.Delete', 'Blockly.Events.Move'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.utils.Coordinate', 'Blockly.utils.object', 'Blockly.utils.xml'], {});
-goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Ui', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.navigation', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.object'], {});
+goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Ui', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.navigation', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {});
 goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.Events', 'Blockly.Events.Ui', 'Blockly.Procedures', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.constants', 'Blockly.inject', 'Blockly.navigation', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour'], {});
 goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {});
 goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent'], {});
@@ -36,8 +36,8 @@ goog.addDependency('../../core/components/component.js', ['Blockly.Component', '
 goog.addDependency('../../core/components/tree/basenode.js', ['Blockly.tree.BaseNode'], ['Blockly.Component', 'Blockly.utils.KeyCodes', 'Blockly.utils.aria', 'Blockly.utils.object', 'Blockly.utils.style'], {});
 goog.addDependency('../../core/components/tree/treecontrol.js', ['Blockly.tree.TreeControl'], ['Blockly.tree.BaseNode', 'Blockly.tree.TreeNode', 'Blockly.utils.aria', 'Blockly.utils.object', 'Blockly.utils.style'], {});
 goog.addDependency('../../core/components/tree/treenode.js', ['Blockly.tree.TreeNode'], ['Blockly.tree.BaseNode', 'Blockly.utils.KeyCodes', 'Blockly.utils.object'], {});
-goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml'], {});
-goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], [], {});
+goog.addDependency('../../core/connection.js', ['Blockly.Connection'], ['Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Xml', 'Blockly.utils.deprecation'], {});
+goog.addDependency('../../core/connection_checker.js', ['Blockly.ConnectionChecker'], ['Blockly.registry'], {});
 goog.addDependency('../../core/connection_db.js', ['Blockly.ConnectionDB'], ['Blockly.RenderedConnection'], {});
 goog.addDependency('../../core/constants.js', ['Blockly.constants'], [], {});
 goog.addDependency('../../core/contextmenu.js', ['Blockly.ContextMenu'], ['Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.Msg', 'Blockly.Xml', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.dom', 'Blockly.utils.userAgent'], {});

core/connection_checker.js

@@ -13,6 +13,8 @@
 
 goog.provide('Blockly.ConnectionChecker');
 
+goog.require('Blockly.registry');
+
 goog.requireType('Blockly.Connection');
 goog.requireType('Blockly.IConnectionChecker');
 
@@ -278,3 +280,6 @@ Blockly.ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) {
   // marker is in the middle of a stack, it won't work.
   return !targetBlock.getPreviousBlock();
 };
+
+Blockly.registry.register(Blockly.registry.Type.CONNECTION_CHECKER,
+    Blockly.registry.DEFAULT, Blockly.ConnectionChecker);

core/registry.js

@@ -15,6 +15,7 @@ goog.provide('Blockly.registry');
 
 goog.requireType('Blockly.blockRendering.Renderer');
 goog.requireType('Blockly.Field');
+goog.requireType('Blockly.IConnectionChecker');
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.Theme');
 goog.requireType('Blockly.utils.toolbox');
@@ -70,6 +71,10 @@ Blockly.registry.Type.TOOLBOX = new Blockly.registry.Type('toolbox');
 /** @type {!Blockly.registry.Type<Blockly.Theme>} */
 Blockly.registry.Type.THEME = new Blockly.registry.Type('theme');
 
+/** @type {!Blockly.registry.Type<Blockly.IConnectionChecker>} */
+Blockly.registry.Type.CONNECTION_CHECKER =
+    new Blockly.registry.Type('connectionChecker');
+
 /**
  * Registers a class based on a type and name.
  * @param {string|Blockly.registry.Type<T>} type The type of the plugin.

core/workspace.js

@@ -44,11 +44,13 @@ Blockly.Workspace = function(opt_options) {
   /** @type {number} */
   this.toolboxPosition = this.options.toolboxPosition;
 
+  var connectionCheckerClass = Blockly.registry.getClassFromOptions(
+      Blockly.registry.Type.CONNECTION_CHECKER, this.options);
   /**
    * An object that encapsulates logic for safety, type, and dragging checks.
    * @type {!Blockly.IConnectionChecker}
    */
-  this.connectionChecker = new Blockly.ConnectionChecker();
+  this.connectionChecker = new connectionCheckerClass(this);
 
   /**
    * @type {!Array.<!Blockly.Block>}

tests/mocha/field_test.js

@@ -382,7 +382,7 @@ suite('Abstract Fields', function() {
       });
       suite('setTooltip', function() {
         setup(function() {
-          this.workspace = new Blockly.WorkspaceSvg({});
+          this.workspace = new Blockly.WorkspaceSvg(new Blockly.Options({}));
           this.workspace.createDom();
         });
         teardown(function() {

tests/mocha/gesture_test.js

@@ -35,7 +35,7 @@ suite('Gesture', function() {
     field.showEditor_ = function() {};
     var gesture = new Blockly.Gesture(this.e, this.workspace);
     gesture.setStartField(field);
-  
+
     var isFieldClick = gesture.isFieldClick_();
     chai.assert.isTrue(isFieldClick);
   });
@@ -53,19 +53,19 @@ suite('Gesture', function() {
     // Populate gesture with click start information
     gesture.setStartField(field);
     gesture.setStartFlyout_(this.workspace.flyout_);
-  
+
     var isFieldClick = gesture.isFieldClick_();
     chai.assert.equal(isFieldClick, expectedResult);
   }
 
   test('Field click - Auto close flyout', function() {
-    var flyout = new Blockly.VerticalFlyout({});
+    var flyout = new Blockly.VerticalFlyout(new Blockly.Options({}));
     flyout.autoClose = false;
     gestureIsFieldClick_InFlyoutHelper.call(this, flyout, true);
   });
 
   test('Field click - Always open flyout', function() {
-    var flyout = new Blockly.VerticalFlyout({});
+    var flyout = new Blockly.VerticalFlyout(new Blockly.Options({}));
     flyout.autoClose = false;
     gestureIsFieldClick_InFlyoutHelper.call(this, flyout, true);
   });

tests/mocha/theme_test.js

@@ -121,7 +121,7 @@ suite('Theme', function() {
   test('Set Theme', function() {
     defineThemeTestBlocks();
     var blockStyles = createBlockStyles();
-    var workspace = new Blockly.WorkspaceSvg({});
+    var workspace = new Blockly.WorkspaceSvg(new Blockly.Options({}));
     var blockA = workspace.newBlock('stack_block');
 
     blockA.setStyle = function() {this.styleName_ = 'styleTwo';};