Skip to content

Commit 34f07c0

Browse files
gonfunkogonfunko
authored
fix: readd the looks blocks (#23)
1 parent f69d4ac commit 34f07c0

File tree

2 files changed

+29
-43
lines changed

2 files changed

+29
-43
lines changed

‎blocks_vertical/looks.js

Lines changed: 28 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,8 @@
1818
* limitations under the License.
1919
*/
2020

21-
'use strict';
22-
23-
goog.provide('Blockly.Blocks.looks');
24-
25-
goog.require('Blockly.Blocks');
26-
goog.require('Blockly.Colours');
27-
goog.require('Blockly.constants');
28-
goog.require('Blockly.ScratchBlocks.VerticalExtensions');
29-
21+
import * as Blockly from 'blockly/core';
22+
import {Categories} from '../src/categories.js';
3023

3124
Blockly.Blocks['looks_sayforsecs'] = {
3225
/**
@@ -46,7 +39,7 @@ Blockly.Blocks['looks_sayforsecs'] = {
4639
"name": "SECS"
4740
}
4841
],
49-
"category": Blockly.Categories.looks,
42+
"category": Categories.looks,
5043
"extensions": ["colours_looks", "shape_statement"]
5144
});
5245
}
@@ -66,7 +59,7 @@ Blockly.Blocks['looks_say'] = {
6659
"name": "MESSAGE"
6760
}
6861
],
69-
"category": Blockly.Categories.looks,
62+
"category": Categories.looks,
7063
"extensions": ["colours_looks", "shape_statement"]
7164
});
7265
}
@@ -90,7 +83,7 @@ Blockly.Blocks['looks_thinkforsecs'] = {
9083
"name": "SECS"
9184
}
9285
],
93-
"category": Blockly.Categories.looks,
86+
"category": Categories.looks,
9487
"extensions": ["colours_looks", "shape_statement"]
9588
});
9689
}
@@ -110,7 +103,7 @@ Blockly.Blocks['looks_think'] = {
110103
"name": "MESSAGE"
111104
}
112105
],
113-
"category": Blockly.Categories.looks,
106+
"category": Categories.looks,
114107
"extensions": ["colours_looks", "shape_statement"]
115108
});
116109
}
@@ -124,7 +117,7 @@ Blockly.Blocks['looks_show'] = {
124117
init: function() {
125118
this.jsonInit({
126119
"message0": Blockly.Msg.LOOKS_SHOW,
127-
"category": Blockly.Categories.looks,
120+
"category": Categories.looks,
128121
"extensions": ["colours_looks", "shape_statement"]
129122
});
130123
}
@@ -138,7 +131,7 @@ Blockly.Blocks['looks_hide'] = {
138131
init: function() {
139132
this.jsonInit({
140133
"message0": Blockly.Msg.LOOKS_HIDE,
141-
"category": Blockly.Categories.looks,
134+
"category": Categories.looks,
142135
"extensions": ["colours_looks", "shape_statement"]
143136
});
144137
}
@@ -154,7 +147,7 @@ Blockly.Blocks['looks_hideallsprites'] = {
154147
init: function() {
155148
this.jsonInit({
156149
"message0": Blockly.Msg.LOOKS_HIDEALLSPRITES,
157-
"category": Blockly.Categories.looks,
150+
"category": Categories.looks,
158151
"extensions": ["colours_looks", "shape_statement"]
159152
});
160153
}
@@ -187,7 +180,7 @@ Blockly.Blocks['looks_changeeffectby'] = {
187180
"name": "CHANGE"
188181
}
189182
],
190-
"category": Blockly.Categories.looks,
183+
"category": Categories.looks,
191184
"extensions": ["colours_looks", "shape_statement"]
192185
});
193186
}
@@ -220,7 +213,7 @@ Blockly.Blocks['looks_seteffectto'] = {
220213
"name": "VALUE"
221214
}
222215
],
223-
"category": Blockly.Categories.looks,
216+
"category": Categories.looks,
224217
"extensions": ["colours_looks", "shape_statement"]
225218
});
226219
}
@@ -234,7 +227,7 @@ Blockly.Blocks['looks_cleargraphiceffects'] = {
234227
init: function() {
235228
this.jsonInit({
236229
"message0": Blockly.Msg.LOOKS_CLEARGRAPHICEFFECTS,
237-
"category": Blockly.Categories.looks,
230+
"category": Categories.looks,
238231
"extensions": ["colours_looks", "shape_statement"]
239232
});
240233
}
@@ -254,7 +247,7 @@ Blockly.Blocks['looks_changesizeby'] = {
254247
"name": "CHANGE"
255248
}
256249
],
257-
"category": Blockly.Categories.looks,
250+
"category": Categories.looks,
258251
"extensions": ["colours_looks", "shape_statement"]
259252
});
260253
}
@@ -274,7 +267,7 @@ Blockly.Blocks['looks_setsizeto'] = {
274267
"name": "SIZE"
275268
}
276269
],
277-
"category": Blockly.Categories.looks,
270+
"category": Categories.looks,
278271
"extensions": ["colours_looks", "shape_statement"]
279272
});
280273
}
@@ -288,7 +281,7 @@ Blockly.Blocks['looks_size'] = {
288281
init: function() {
289282
this.jsonInit({
290283
"message0": Blockly.Msg.LOOKS_SIZE,
291-
"category": Blockly.Categories.looks,
284+
"category": Categories.looks,
292285
"checkboxInFlyout": true,
293286
"extensions": ["colours_looks", "output_number"]
294287
});
@@ -318,7 +311,7 @@ Blockly.Blocks['looks_changestretchby'] = {
318311
"name": "CHANGE"
319312
}
320313
],
321-
"category": Blockly.Categories.looks,
314+
"category": Categories.looks,
322315
"extensions": ["colours_looks", "shape_statement"]
323316
});
324317
}
@@ -340,7 +333,7 @@ Blockly.Blocks['looks_setstretchto'] = {
340333
"name": "STRETCH"
341334
}
342335
],
343-
"category": Blockly.Categories.looks,
336+
"category": Categories.looks,
344337
"extensions": ["colours_looks", "shape_statement"]
345338
});
346339
}
@@ -364,11 +357,7 @@ Blockly.Blocks['looks_costume'] = {
364357
]
365358
}
366359
],
367-
"colour": Blockly.Colours.looks.secondary,
368-
"colourSecondary": Blockly.Colours.looks.secondary,
369-
"colourTertiary": Blockly.Colours.looks.tertiary,
370-
"colourQuaternary": Blockly.Colours.looks.quaternary,
371-
"extensions": ["output_string"]
360+
"extensions": ["colours_looks", "output_string"]
372361
});
373362
}
374363
};
@@ -387,7 +376,7 @@ Blockly.Blocks['looks_switchcostumeto'] = {
387376
"name": "COSTUME"
388377
}
389378
],
390-
"category": Blockly.Categories.looks,
379+
"category": Categories.looks,
391380
"extensions": ["colours_looks", "shape_statement"]
392381
});
393382
}
@@ -401,7 +390,7 @@ Blockly.Blocks['looks_nextcostume'] = {
401390
init: function() {
402391
this.jsonInit({
403392
"message0": Blockly.Msg.LOOKS_NEXTCOSTUME,
404-
"category": Blockly.Categories.looks,
393+
"category": Categories.looks,
405394
"extensions": ["colours_looks", "shape_statement"]
406395
});
407396
}
@@ -421,7 +410,7 @@ Blockly.Blocks['looks_switchbackdropto'] = {
421410
"name": "BACKDROP"
422411
}
423412
],
424-
"category": Blockly.Categories.looks,
413+
"category": Categories.looks,
425414
"extensions": ["colours_looks", "shape_statement"]
426415
});
427416
}
@@ -445,11 +434,7 @@ Blockly.Blocks['looks_backdrops'] = {
445434
]
446435
}
447436
],
448-
"colour": Blockly.Colours.looks.secondary,
449-
"colourSecondary": Blockly.Colours.looks.secondary,
450-
"colourTertiary": Blockly.Colours.looks.tertiary,
451-
"colourQuaternary": Blockly.Colours.looks.quaternary,
452-
"extensions": ["output_string"]
437+
"extensions": ["colours_looks", "output_string"]
453438
});
454439
}
455440
};
@@ -472,7 +457,7 @@ Blockly.Blocks['looks_gotofrontback'] = {
472457
]
473458
}
474459
],
475-
"category": Blockly.Categories.looks,
460+
"category": Categories.looks,
476461
"extensions": ["colours_looks", "shape_statement"]
477462
});
478463
}
@@ -500,7 +485,7 @@ Blockly.Blocks['looks_goforwardbackwardlayers'] = {
500485
"name": "NUM"
501486
}
502487
],
503-
"category": Blockly.Categories.looks,
488+
"category": Categories.looks,
504489
"extensions": ["colours_looks", "shape_statement"]
505490
});
506491
}
@@ -524,7 +509,7 @@ Blockly.Blocks['looks_backdropnumbername'] = {
524509
]
525510
}
526511
],
527-
"category": Blockly.Categories.looks,
512+
"category": Categories.looks,
528513
"checkboxInFlyout": true,
529514
"extensions": ["colours_looks", "output_number"]
530515
});
@@ -549,7 +534,7 @@ Blockly.Blocks['looks_costumenumbername'] = {
549534
]
550535
}
551536
],
552-
"category": Blockly.Categories.looks,
537+
"category": Categories.looks,
553538
"checkboxInFlyout": true,
554539
"extensions": ["colours_looks", "output_number"]
555540
});
@@ -570,7 +555,7 @@ Blockly.Blocks['looks_switchbackdroptoandwait'] = {
570555
"name": "BACKDROP"
571556
}
572557
],
573-
"category": Blockly.Categories.looks,
558+
"category": Categories.looks,
574559
"extensions": ["colours_looks", "shape_statement"]
575560
});
576561
}
@@ -584,7 +569,7 @@ Blockly.Blocks['looks_nextbackdrop'] = {
584569
init: function() {
585570
this.jsonInit({
586571
"message0": Blockly.Msg.LOOKS_NEXTBACKDROP_BLOCK,
587-
"category": Blockly.Categories.looks,
572+
"category": Categories.looks,
588573
"extensions": ["colours_looks", "shape_statement"]
589574
});
590575
}

‎src/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import '../blocks_common/math.js';
88
import '../blocks_vertical/vertical_extensions.js';
99
import '../blocks_vertical/control.js';
1010
import '../blocks_vertical/event.js';
11+
import '../blocks_vertical/looks.js';
1112
import '../blocks_vertical/motion.js';
1213
import '../blocks_vertical/operators.js';
1314

0 commit comments

Comments
 (0)