mirror of
https://github.com/google/blockly.git
synced 2026-01-07 00:50:27 +01:00
Migrate blocks/colour.js to goog.module syntax (#5738)
* Migrate blocks/colour.js to goog.module * Migrate blocks/colour.js named requires This causes an apparently harmless reordering of the files for the first chunk. * clang-format blocks/colour.js
This commit is contained in:
Christopher Allen
committed by
GitHub
GitHub
parent
c0d22f2002
commit
25a4561e21
129
blocks/colour.js
129
blocks/colour.js
@@ -6,111 +6,102 @@
|
||||
|
||||
/**
|
||||
* @fileoverview Colour blocks for Blockly.
|
||||
* @suppress {extraRequire|missingRequire}
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
goog.provide('Blockly.blocks.colour');
|
||||
goog.provide('Blockly.Constants.Colour');
|
||||
goog.module('Blockly.blocks.colour');
|
||||
|
||||
goog.require('Blockly');
|
||||
goog.require('Blockly.FieldColour');
|
||||
goog.require('Blockly.FieldLabel');
|
||||
const {defineBlocksWithJsonArray} = goog.require('Blockly.common');
|
||||
|
||||
|
||||
/**
|
||||
* Unused constant for the common HSV hue for all blocks in this category.
|
||||
* @deprecated Use Blockly.Msg['COLOUR_HUE']. (2018 April 5)
|
||||
*/
|
||||
Blockly.Constants.Colour.HUE = 20;
|
||||
|
||||
Blockly.defineBlocksWithJsonArray([
|
||||
defineBlocksWithJsonArray([
|
||||
// Block for colour picker.
|
||||
{
|
||||
"type": "colour_picker",
|
||||
"message0": "%1",
|
||||
"args0": [
|
||||
'type': 'colour_picker',
|
||||
'message0': '%1',
|
||||
'args0': [
|
||||
{
|
||||
"type": "field_colour",
|
||||
"name": "COLOUR",
|
||||
"colour": "#ff0000",
|
||||
'type': 'field_colour',
|
||||
'name': 'COLOUR',
|
||||
'colour': '#ff0000',
|
||||
},
|
||||
],
|
||||
"output": "Colour",
|
||||
"helpUrl": "%{BKY_COLOUR_PICKER_HELPURL}",
|
||||
"style": "colour_blocks",
|
||||
"tooltip": "%{BKY_COLOUR_PICKER_TOOLTIP}",
|
||||
"extensions": ["parent_tooltip_when_inline"],
|
||||
'output': 'Colour',
|
||||
'helpUrl': '%{BKY_COLOUR_PICKER_HELPURL}',
|
||||
'style': 'colour_blocks',
|
||||
'tooltip': '%{BKY_COLOUR_PICKER_TOOLTIP}',
|
||||
'extensions': ['parent_tooltip_when_inline'],
|
||||
},
|
||||
|
||||
// Block for random colour.
|
||||
{
|
||||
"type": "colour_random",
|
||||
"message0": "%{BKY_COLOUR_RANDOM_TITLE}",
|
||||
"output": "Colour",
|
||||
"helpUrl": "%{BKY_COLOUR_RANDOM_HELPURL}",
|
||||
"style": "colour_blocks",
|
||||
"tooltip": "%{BKY_COLOUR_RANDOM_TOOLTIP}",
|
||||
'type': 'colour_random',
|
||||
'message0': '%{BKY_COLOUR_RANDOM_TITLE}',
|
||||
'output': 'Colour',
|
||||
'helpUrl': '%{BKY_COLOUR_RANDOM_HELPURL}',
|
||||
'style': 'colour_blocks',
|
||||
'tooltip': '%{BKY_COLOUR_RANDOM_TOOLTIP}',
|
||||
},
|
||||
|
||||
// Block for composing a colour from RGB components.
|
||||
{
|
||||
"type": "colour_rgb",
|
||||
"message0": "%{BKY_COLOUR_RGB_TITLE} %{BKY_COLOUR_RGB_RED} %1 %{BKY_COLOUR_RGB_GREEN} %2 %{BKY_COLOUR_RGB_BLUE} %3",
|
||||
"args0": [
|
||||
'type': 'colour_rgb',
|
||||
'message0':
|
||||
'%{BKY_COLOUR_RGB_TITLE} %{BKY_COLOUR_RGB_RED} %1 %{BKY_COLOUR_RGB_GREEN} %2 %{BKY_COLOUR_RGB_BLUE} %3',
|
||||
'args0': [
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "RED",
|
||||
"check": "Number",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'RED',
|
||||
'check': 'Number',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "GREEN",
|
||||
"check": "Number",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'GREEN',
|
||||
'check': 'Number',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "BLUE",
|
||||
"check": "Number",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'BLUE',
|
||||
'check': 'Number',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
],
|
||||
"output": "Colour",
|
||||
"helpUrl": "%{BKY_COLOUR_RGB_HELPURL}",
|
||||
"style": "colour_blocks",
|
||||
"tooltip": "%{BKY_COLOUR_RGB_TOOLTIP}",
|
||||
'output': 'Colour',
|
||||
'helpUrl': '%{BKY_COLOUR_RGB_HELPURL}',
|
||||
'style': 'colour_blocks',
|
||||
'tooltip': '%{BKY_COLOUR_RGB_TOOLTIP}',
|
||||
},
|
||||
|
||||
// Block for blending two colours together.
|
||||
{
|
||||
"type": "colour_blend",
|
||||
"message0": "%{BKY_COLOUR_BLEND_TITLE} %{BKY_COLOUR_BLEND_COLOUR1} " +
|
||||
"%1 %{BKY_COLOUR_BLEND_COLOUR2} %2 %{BKY_COLOUR_BLEND_RATIO} %3",
|
||||
"args0": [
|
||||
'type': 'colour_blend',
|
||||
'message0': '%{BKY_COLOUR_BLEND_TITLE} %{BKY_COLOUR_BLEND_COLOUR1} ' +
|
||||
'%1 %{BKY_COLOUR_BLEND_COLOUR2} %2 %{BKY_COLOUR_BLEND_RATIO} %3',
|
||||
'args0': [
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "COLOUR1",
|
||||
"check": "Colour",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'COLOUR1',
|
||||
'check': 'Colour',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "COLOUR2",
|
||||
"check": "Colour",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'COLOUR2',
|
||||
'check': 'Colour',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
{
|
||||
"type": "input_value",
|
||||
"name": "RATIO",
|
||||
"check": "Number",
|
||||
"align": "RIGHT",
|
||||
'type': 'input_value',
|
||||
'name': 'RATIO',
|
||||
'check': 'Number',
|
||||
'align': 'RIGHT',
|
||||
},
|
||||
],
|
||||
"output": "Colour",
|
||||
"helpUrl": "%{BKY_COLOUR_BLEND_HELPURL}",
|
||||
"style": "colour_blocks",
|
||||
"tooltip": "%{BKY_COLOUR_BLEND_TOOLTIP}",
|
||||
'output': 'Colour',
|
||||
'helpUrl': '%{BKY_COLOUR_BLEND_HELPURL}',
|
||||
'style': 'colour_blocks',
|
||||
'tooltip': '%{BKY_COLOUR_BLEND_TOOLTIP}',
|
||||
},
|
||||
]);
|
||||
|
||||
@@ -13,6 +13,69 @@
|
||||
"./core/serialization/variables.js",
|
||||
"./core/utils/global.js",
|
||||
"./core/msg.js",
|
||||
"./core/widgetdiv.js",
|
||||
"./core/clipboard.js",
|
||||
"./core/menuitem.js",
|
||||
"./core/menu.js",
|
||||
"./core/contextmenu.js",
|
||||
"./core/events/workspace_events.js",
|
||||
"./core/events/events_toolbox_item_select.js",
|
||||
"./core/events/events_ui.js",
|
||||
"./core/events/events.js",
|
||||
"./core/contextmenu_items.js",
|
||||
"./core/shortcut_items.js",
|
||||
"./core/theme/zelos.js",
|
||||
"./core/theme/themes.js",
|
||||
"./core/renderers/geras/constants.js",
|
||||
"./core/renderers/geras/highlight_constants.js",
|
||||
"./core/renderers/geras/measurables/inline_input.js",
|
||||
"./core/renderers/geras/path_object.js",
|
||||
"./core/renderers/geras/renderer.js",
|
||||
"./core/renderers/geras/measurables/statement_input.js",
|
||||
"./core/renderers/geras/info.js",
|
||||
"./core/renderers/geras/highlighter.js",
|
||||
"./core/renderers/geras/drawer.js",
|
||||
"./core/renderers/geras/geras.js",
|
||||
"./core/loop_mixin.js",
|
||||
"./core/renderers/minimalist/constants.js",
|
||||
"./core/renderers/minimalist/renderer.js",
|
||||
"./core/renderers/minimalist/info.js",
|
||||
"./core/renderers/minimalist/drawer.js",
|
||||
"./core/renderers/minimalist/minimalist.js",
|
||||
"./core/renderers/thrasos/renderer.js",
|
||||
"./core/renderers/thrasos/info.js",
|
||||
"./core/renderers/thrasos/thrasos.js",
|
||||
"./core/renderers/zelos/measurables/bottom_row.js",
|
||||
"./core/renderers/zelos/constants.js",
|
||||
"./core/renderers/zelos/path_object.js",
|
||||
"./core/field_image.js",
|
||||
"./core/field_textinput.js",
|
||||
"./core/renderers/zelos/marker_svg.js",
|
||||
"./core/renderers/zelos/renderer.js",
|
||||
"./core/renderers/zelos/measurables/row_elements.js",
|
||||
"./core/renderers/zelos/measurables/inputs.js",
|
||||
"./core/renderers/zelos/measurables/top_row.js",
|
||||
"./core/renderers/zelos/info.js",
|
||||
"./core/renderers/zelos/drawer.js",
|
||||
"./core/renderers/zelos/zelos.js",
|
||||
"./core/toolbox/collapsible_category.js",
|
||||
"./core/field_angle.js",
|
||||
"./core/field_checkbox.js",
|
||||
"./core/field_colour.js",
|
||||
"./core/field_dropdown.js",
|
||||
"./core/field_label_serializable.js",
|
||||
"./core/field_multilineinput.js",
|
||||
"./core/field_number.js",
|
||||
"./core/field_variable.js",
|
||||
"./core/flyout_metrics_manager.js",
|
||||
"./core/flyout_base.js",
|
||||
"./core/generator.js",
|
||||
"./core/flyout_horizontal.js",
|
||||
"./core/interfaces/i_styleable.js",
|
||||
"./core/toolbox/toolbox.js",
|
||||
"./core/flyout_vertical.js",
|
||||
"./core/inject.js",
|
||||
"./core/blockly.js",
|
||||
"./core/blocks.js",
|
||||
"./core/utils/useragent.js",
|
||||
"./core/utils/svg.js",
|
||||
@@ -203,69 +266,6 @@
|
||||
"./core/xml.js",
|
||||
"./core/connection.js",
|
||||
"./core/common.js",
|
||||
"./core/widgetdiv.js",
|
||||
"./core/clipboard.js",
|
||||
"./core/menuitem.js",
|
||||
"./core/menu.js",
|
||||
"./core/contextmenu.js",
|
||||
"./core/events/workspace_events.js",
|
||||
"./core/events/events_toolbox_item_select.js",
|
||||
"./core/events/events_ui.js",
|
||||
"./core/events/events.js",
|
||||
"./core/contextmenu_items.js",
|
||||
"./core/shortcut_items.js",
|
||||
"./core/theme/zelos.js",
|
||||
"./core/theme/themes.js",
|
||||
"./core/renderers/geras/constants.js",
|
||||
"./core/renderers/geras/highlight_constants.js",
|
||||
"./core/renderers/geras/measurables/inline_input.js",
|
||||
"./core/renderers/geras/path_object.js",
|
||||
"./core/renderers/geras/renderer.js",
|
||||
"./core/renderers/geras/measurables/statement_input.js",
|
||||
"./core/renderers/geras/info.js",
|
||||
"./core/renderers/geras/highlighter.js",
|
||||
"./core/renderers/geras/drawer.js",
|
||||
"./core/renderers/geras/geras.js",
|
||||
"./core/loop_mixin.js",
|
||||
"./core/renderers/minimalist/constants.js",
|
||||
"./core/renderers/minimalist/renderer.js",
|
||||
"./core/renderers/minimalist/info.js",
|
||||
"./core/renderers/minimalist/drawer.js",
|
||||
"./core/renderers/minimalist/minimalist.js",
|
||||
"./core/renderers/thrasos/renderer.js",
|
||||
"./core/renderers/thrasos/info.js",
|
||||
"./core/renderers/thrasos/thrasos.js",
|
||||
"./core/renderers/zelos/measurables/bottom_row.js",
|
||||
"./core/renderers/zelos/constants.js",
|
||||
"./core/renderers/zelos/path_object.js",
|
||||
"./core/field_image.js",
|
||||
"./core/field_textinput.js",
|
||||
"./core/renderers/zelos/marker_svg.js",
|
||||
"./core/renderers/zelos/renderer.js",
|
||||
"./core/renderers/zelos/measurables/row_elements.js",
|
||||
"./core/renderers/zelos/measurables/inputs.js",
|
||||
"./core/renderers/zelos/measurables/top_row.js",
|
||||
"./core/renderers/zelos/info.js",
|
||||
"./core/renderers/zelos/drawer.js",
|
||||
"./core/renderers/zelos/zelos.js",
|
||||
"./core/toolbox/collapsible_category.js",
|
||||
"./core/field_angle.js",
|
||||
"./core/field_checkbox.js",
|
||||
"./core/field_colour.js",
|
||||
"./core/field_dropdown.js",
|
||||
"./core/field_label_serializable.js",
|
||||
"./core/field_multilineinput.js",
|
||||
"./core/field_number.js",
|
||||
"./core/field_variable.js",
|
||||
"./core/flyout_metrics_manager.js",
|
||||
"./core/flyout_base.js",
|
||||
"./core/generator.js",
|
||||
"./core/flyout_horizontal.js",
|
||||
"./core/interfaces/i_styleable.js",
|
||||
"./core/toolbox/toolbox.js",
|
||||
"./core/flyout_vertical.js",
|
||||
"./core/inject.js",
|
||||
"./core/blockly.js",
|
||||
"./closure/goog/base_minimal.js",
|
||||
"./core/requires.js",
|
||||
"./blocks/variables_dynamic.js",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
goog.addDependency('../../blocks/all.js', ['Blockly.blocks.all'], ['Blockly.blocks.colour', 'Blockly.blocks.lists', 'Blockly.blocks.logic', 'Blockly.blocks.loops', 'Blockly.blocks.math', 'Blockly.blocks.procedures', 'Blockly.blocks.texts', 'Blockly.blocks.variables', 'Blockly.blocks.variablesDynamic'], {'module': 'goog'});
|
||||
goog.addDependency('../../blocks/colour.js', ['Blockly.Constants.Colour', 'Blockly.blocks.colour'], ['Blockly', 'Blockly.FieldColour', 'Blockly.FieldLabel'], {'lang': 'es5'});
|
||||
goog.addDependency('../../blocks/colour.js', ['Blockly.blocks.colour'], ['Blockly.common'], {'lang': 'es6', 'module': 'goog'});
|
||||
goog.addDependency('../../blocks/lists.js', ['Blockly.Constants.Lists', 'Blockly.blocks.lists'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es6'});
|
||||
goog.addDependency('../../blocks/logic.js', ['Blockly.Constants.Logic', 'Blockly.blocks.logic'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.Mutator'], {'lang': 'es6'});
|
||||
goog.addDependency('../../blocks/loops.js', ['Blockly.Constants.Loops', 'Blockly.blocks.loops'], ['Blockly', 'Blockly.FieldDropdown', 'Blockly.FieldLabel', 'Blockly.FieldNumber', 'Blockly.FieldVariable', 'Blockly.Warning', 'Blockly.loopMixin'], {'lang': 'es6'});
|
||||
|
||||
Reference in New Issue
Block a user