scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changing color of list blocks to differentiate from varaible blocks (according to color chart in issue #600).

Browse source
This commit is contained in:
Karishma Chadha 2017-11-29 11:57:55 -05:00
parent 109d22df2b
commit b2b7f7d2ff
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
blocks_vertical/data.js
View file

@ -166,7 +166,7 @@ Blockly.Blocks['data_listcontents'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "output_string"],
"extensions": ["colours_data_lists", "output_string"],
"checkboxInFlyout": true
});
}
@ -248,7 +248,7 @@ Blockly.Blocks['data_addtolist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};
@ -273,7 +273,7 @@ Blockly.Blocks['data_deleteoflist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};
@ -302,7 +302,7 @@ Blockly.Blocks['data_insertatlist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};
@ -331,7 +331,7 @@ Blockly.Blocks['data_replaceitemoflist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};
@ -357,7 +357,7 @@ Blockly.Blocks['data_itemoflist'] = {
],
"output": null,
"category": Blockly.Categories.data,
"extensions": ["colours_data"],
"extensions": ["colours_data_lists"],
"outputShape": Blockly.OUTPUT_SHAPE_ROUND
});
}
@ -379,7 +379,7 @@ Blockly.Blocks['data_lengthoflist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "output_number"]
"extensions": ["colours_data_lists", "output_number"]
});
}
};
@ -404,7 +404,7 @@ Blockly.Blocks['data_listcontainsitem'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "output_boolean"]
"extensions": ["colours_data_lists", "output_boolean"]
});
}
};
@ -425,7 +425,7 @@ Blockly.Blocks['data_showlist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};
@ -446,7 +446,7 @@ Blockly.Blocks['data_hidelist'] = {
}
],
"category": Blockly.Categories.data,
"extensions": ["colours_data", "shape_statement"]
"extensions": ["colours_data_lists", "shape_statement"]
});
}
};

4
blocks_vertical/vertical_extensions.js
View file

@ -217,8 +217,8 @@ Blockly.ScratchBlocks.VerticalExtensions.PROCEDURE_CALL_CONTEXTMENU = {
*/
Blockly.ScratchBlocks.VerticalExtensions.registerAll = function() {
var categoryNames =
['control', 'data', 'sounds', 'motion', 'looks', 'event', 'sensing',
'pen', 'operators', 'more'];
['control', 'data', 'data_lists', 'sounds', 'motion', 'looks', 'event',
'sensing', 'pen', 'operators', 'more'];
// Register functions for all category colours.
for (var i = 0; i < categoryNames.length; i++) {
name = categoryNames[i];

7
core/colours.js
View file

@ -70,6 +70,13 @@ Blockly.Colours = {
"secondary": "#FF8000",
"tertiary": "#DB6E00"
},
// This is not a new category, but rather for differentiation
// between lists and scalar variables.
"data_lists": {
"primary": "#FF661A",
"secondary": "#FF5500",
"tertiary": "#E64D00"
},
"more": {
"primary": "#FF6680",
"secondary": "#FF4D6A",