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

Removed Object.assign() from turtle demo (#3157)

Browse Source 
* Removed Object.assign() from turtle demo.
This commit is contained in:
Beka Westberg
2019-10-03 19:39:06 -07:00
committed by Sam El-Husseini
parent 80aac249ea
commit bc68167763
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/custom-fields/turtle/blocks.js
View File

@@ -48,7 +48,11 @@ Blockly.Blocks['turtle_nullifier'] = {
},
validate: function(newValue) {
this.cachedValidatedValue_ = Object.assign({}, newValue);
this.cachedValidatedValue_ = {
turtleName: newValue.turtleName,
pattern: newValue.pattern,
hat: newValue.hat,
};
if ((newValue.turtleName == 'Leonardo' && newValue.hat == 'Mask') ||
(newValue.turtleName == 'Yertle' && newValue.hat == 'Crown') ||
(newValue.turtleName == 'Franklin') && newValue.hat == 'Propeller') {

16
demos/custom-fields/turtle/field_turtle.js
View File

@@ -316,16 +316,18 @@ CustomFields.FieldTurtle.prototype.renderEditor_ = function() {
// included inside render_ (it is not called anywhere else), but it is
// usually separated to keep code more organized.
CustomFields.FieldTurtle.prototype.updateSize_ = function() {
var size = this.movableGroup_.getBBox();
var bbox = this.movableGroup_.getBBox();
var width = bbox.width;
var height = bbox.height;
if (this.borderRect_) {
size.width += this.PADDING;
size.height += this.PADDING;
this.borderRect_.setAttribute('width', size.width);
this.borderRect_.setAttribute('height', size.height);
width += this.PADDING;
height += this.PADDING;
this.borderRect_.setAttribute('width', width);
this.borderRect_.setAttribute('height', height);
}
// Note how both the width and the height can be dynamic.
this.size_.width = size.width;
this.size_.height = size.height;
this.size_.width = width;
this.size_.height = height;
};
// Called when the field is clicked. It is usually used to show an editor,