refactor: convert some block generators to goog.module

generators/dart/colour.js

@@ -9,50 +9,50 @@
  */
 'use strict';
 
-goog.provide('Blockly.Dart.colour');
+goog.module('Blockly.Dart.colour');
 
-goog.require('Blockly.Dart');
+const Dart = goog.require('Blockly.Dart');
 
 
-Blockly.Dart.addReservedWords('Math');
+Dart.addReservedWords('Math');
 
-Blockly.Dart['colour_picker'] = function(block) {
+Dart['colour_picker'] = function(block) {
   // Colour picker.
-  const code = Blockly.Dart.quote_(block.getFieldValue('COLOUR'));
-  return [code, Blockly.Dart.ORDER_ATOMIC];
+  const code = Dart.quote_(block.getFieldValue('COLOUR'));
+  return [code, Dart.ORDER_ATOMIC];
 };
 
-Blockly.Dart['colour_random'] = function(block) {
+Dart['colour_random'] = function(block) {
   // Generate a random colour.
-  Blockly.Dart.definitions_['import_dart_math'] =
+  Dart.definitions_['import_dart_math'] =
       'import \'dart:math\' as Math;';
-  const functionName = Blockly.Dart.provideFunction_(
+  const functionName = Dart.provideFunction_(
       'colour_random',
-      ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ + '() {',
+      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ + '() {',
        '  String hex = \'0123456789abcdef\';',
        '  var rnd = new Math.Random();',
        '  return \'#${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
        '      \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\'',
        '      \'${hex[rnd.nextInt(16)]}${hex[rnd.nextInt(16)]}\';',
        '}']);
   const code = functionName + '()';
-  return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+  return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Blockly.Dart['colour_rgb'] = function(block) {
+Dart['colour_rgb'] = function(block) {
   // Compose a colour from RGB components expressed as percentages.
-  const red = Blockly.Dart.valueToCode(block, 'RED',
-      Blockly.Dart.ORDER_NONE) || 0;
-  const green = Blockly.Dart.valueToCode(block, 'GREEN',
-      Blockly.Dart.ORDER_NONE) || 0;
-  const blue = Blockly.Dart.valueToCode(block, 'BLUE',
-      Blockly.Dart.ORDER_NONE) || 0;
+  const red = Dart.valueToCode(block, 'RED',
+      Dart.ORDER_NONE) || 0;
+  const green = Dart.valueToCode(block, 'GREEN',
+      Dart.ORDER_NONE) || 0;
+  const blue = Dart.valueToCode(block, 'BLUE',
+      Dart.ORDER_NONE) || 0;
 
-  Blockly.Dart.definitions_['import_dart_math'] =
+  Dart.definitions_['import_dart_math'] =
       'import \'dart:math\' as Math;';
-  const functionName = Blockly.Dart.provideFunction_(
+  const functionName = Dart.provideFunction_(
       'colour_rgb',
-      ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
           '(num r, num g, num b) {',
        '  num rn = (Math.max(Math.min(r, 100), 0) * 2.55).round();',
        '  String rs = rn.toInt().toRadixString(16);',
@@ -69,23 +69,23 @@ Blockly.Dart['colour_rgb'] = function(block) {
        '  return \'#$rs$gs$bs\';',
        '}']);
   const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
-  return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+  return [code, Dart.ORDER_UNARY_POSTFIX];
 };
 
-Blockly.Dart['colour_blend'] = function(block) {
+Dart['colour_blend'] = function(block) {
   // Blend two colours together.
-  const c1 = Blockly.Dart.valueToCode(block, 'COLOUR1',
-      Blockly.Dart.ORDER_NONE) || '\'#000000\'';
-  const c2 = Blockly.Dart.valueToCode(block, 'COLOUR2',
-      Blockly.Dart.ORDER_NONE) || '\'#000000\'';
-  const ratio = Blockly.Dart.valueToCode(block, 'RATIO',
-      Blockly.Dart.ORDER_NONE) || 0.5;
+  const c1 = Dart.valueToCode(block, 'COLOUR1',
+      Dart.ORDER_NONE) || '\'#000000\'';
+  const c2 = Dart.valueToCode(block, 'COLOUR2',
+      Dart.ORDER_NONE) || '\'#000000\'';
+  const ratio = Dart.valueToCode(block, 'RATIO',
+      Dart.ORDER_NONE) || 0.5;
 
-  Blockly.Dart.definitions_['import_dart_math'] =
+  Dart.definitions_['import_dart_math'] =
       'import \'dart:math\' as Math;';
-  const functionName = Blockly.Dart.provideFunction_(
+  const functionName = Dart.provideFunction_(
       'colour_blend',
-      ['String ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
+      ['String ' + Dart.FUNCTION_NAME_PLACEHOLDER_ +
           '(String c1, String c2, num ratio) {',
        '  ratio = Math.max(Math.min(ratio, 1), 0);',
        '  int r1 = int.parse(\'0x${c1.substring(1, 3)}\');',
@@ -109,5 +109,5 @@ Blockly.Dart['colour_blend'] = function(block) {
        '  return \'#$rs$gs$bs\';',
        '}']);
   const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
-  return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
+  return [code, Dart.ORDER_UNARY_POSTFIX];
 };