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

Fix conflict between 'utils' and 'image dropdown' merges.

Browse Source
This commit is contained in:
Neil Fraser
2016-11-16 17:56:25 -08:00
parent a027ec8573
commit 0e9651ee88
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/field_dropdown.js
View File

@@ -352,7 +352,7 @@ Blockly.FieldDropdown.prototype.render_ = function() {
if (this.imageJson_) {
// Image option is selected.
this.imageElement_ = Blockly.createSvgElement('image',
this.imageElement_ = Blockly.utils.createSvgElement('image',
{'y': 5,
'height': this.imageJson_.height + 'px',
'width': this.imageJson_.width + 'px'}, this.fieldGroup_);