From 0e9651ee88ae5ecec12535e828f8724b2b997dc4 Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Wed, 16 Nov 2016 17:56:25 -0800 Subject: [PATCH] Fix conflict between 'utils' and 'image dropdown' merges. --- core/field_dropdown.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/field_dropdown.js b/core/field_dropdown.js index 5614a9009..a8a632573 100644 --- a/core/field_dropdown.js +++ b/core/field_dropdown.js @@ -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_);