CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 10:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Merge input.js

Browse Source
This commit is contained in:
Evan W. Patton
2016-09-28 20:53:11 -04:00
parent 081574babe
commit 632e09ac12
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/input.js
View File

@@ -41,8 +41,14 @@ goog.require('goog.asserts');
* @constructor
*/
Blockly.Input = function(type, name, block, connection) {
/** @type {number} */
this.type = type;
if (type == Blockly.INDENTED_VALUE) {
/** @type {number} */
this.type = Blockly.INPUT_VALUE;
/** @type {number} */
this.subtype = Blockly.INDENTED_VALUE;
} else {
this.type = type;
}
/** @type {string} */
this.name = name;
/**

23
core/input.js.rej
View File

@@ -1,23 +0,0 @@
***************
*** 43,49 ****
* @constructor
*/
Blockly.Input = function(type, name, block, connection) {
- this.type = type;
this.name = name;
this.sourceBlock_ = block;
this.connection = connection;
--- 43,55 ----
* @constructor
*/
Blockly.Input = function(type, name, block, connection) {
+ if (type == Blockly.INDENTED_VALUE){
+ this.type = Blockly.INPUT_VALUE;
+ this.subtype = Blockly.INDENTED_VALUE;
+ }
+ else {
+ this.type = type;
+ }
this.name = name;
this.sourceBlock_ = block;
this.connection = connection;