Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion blocks/loops.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Blockly.Blocks['controls_repeat'] = {
"message0": Blockly.Msg.CONTROLS_REPEAT_TITLE,
"args0": [
{
"type": "field_input",
"type": "field_number",
"name": "TIMES",
"text": "10"
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/math.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Blockly.Blocks['math_number'] = {
this.setHelpUrl(Blockly.Msg.MATH_NUMBER_HELPURL);
this.setColour(Blockly.Blocks.math.HUE);
this.appendDummyInput()
.appendField(new Blockly.FieldTextInput('0',
.appendField(new Blockly.FieldNumber('0',
Blockly.FieldTextInput.numberValidator), 'NUM');
this.setOutput(true, 'Number');
// Assign 'this' to a variable for use in the tooltip closure below.
Expand Down
3 changes: 3 additions & 0 deletions core/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,9 @@ Blockly.Block.prototype.interpolate_ = function(message, args, lastDummyAlign) {
field = new Blockly.FieldImage(element['src'],
element['width'], element['height'], element['alt']);
break;
case 'field_number':
field = new Blockly.FieldNumber(element['text']);
break;
case 'field_date':
if (Blockly.FieldDate) {
field = new Blockly.FieldDate(element['date']);
Expand Down
1 change: 1 addition & 0 deletions core/blockly.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ goog.require('Blockly.FieldColour');
goog.require('Blockly.FieldDropdown');
goog.require('Blockly.FieldImage');
goog.require('Blockly.FieldTextInput');
goog.require('Blockly.FieldNumber');
goog.require('Blockly.FieldVariable');
goog.require('Blockly.Generator');
goog.require('Blockly.Msg');
Expand Down
45 changes: 45 additions & 0 deletions core/field_number.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/**
* @license
* Visual Blocks Editor
*
* Copyright 2016 Google Inc.
* https://developers.google.com/blockly/
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* @fileoverview Number input field
* @author [email protected] (Rachel Fenichel)
*/
'use strict';

goog.provide('Blockly.FieldNumber');

goog.require('Blockly.FieldTextInput');

/**
* Class for an editable number field.
* @param {string} text The initial content of the field.
* @param {Function=} opt_validator An optional function that is called
* to validate any constraints on what the user entered. Takes the new
* text as an argument and returns either the accepted text, a replacement
* text, or null to abort the change.
* @extends {Blockly.FieldTextInput}
* @constructor
*/
Blockly.FieldNumber = function(text, opt_validator) {
Blockly.FieldNumber.superClass_.constructor.call(this, text,
opt_validator);
};
goog.inherits(Blockly.FieldNumber, Blockly.FieldTextInput);