Skip to content

Commit 83546a1

Browse files
author
Ke, Mingze
committed
Fix the search pattern for replacing function source code
1 parent 3031ce6 commit 83546a1

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

generators/webduino.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ Blockly.JavaScript['getdate'] = function (block) {
750750
var dropdown_date_ = block.getFieldValue('date_');
751751
var functionName = Blockly.JavaScript.provideFunction_(
752752
'get_date', ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(t) {',
753-
_getdate.toString().replace('function _getdate() {\n', '')
753+
_getdate.toString().replace(/function _getdate\(\) {\r?\n/, '')
754754
]);
755755
var code = functionName + '("' + dropdown_date_ + '")';
756756
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
@@ -784,7 +784,7 @@ Blockly.JavaScript['gettime'] = function (block) {
784784
var dropdown_time_ = block.getFieldValue('time_');
785785
var functionName = Blockly.JavaScript.provideFunction_(
786786
'get_time', ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(t) {',
787-
_gettime.toString().replace('function _gettime() {\n', '')
787+
_gettime.toString().replace(/function _gettime\(\) {\r?\n/, '')
788788
]);
789789
var code = functionName + '("' + dropdown_time_ + '")';
790790
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
@@ -1262,7 +1262,7 @@ Blockly.JavaScript['buzzer_music'] = function (block) {
12621262
var statements_music_ = Blockly.JavaScript.statementToCode(block, 'music_');
12631263
var functionName = Blockly.JavaScript.provideFunction_(
12641264
'buzzer_music', ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(m) {',
1265-
_buzzer_music.toString().replace('function _buzzer_music(m) {\n', '')
1265+
_buzzer_music.toString().replace(/function _buzzer_music\(m\) {\r?\n/, '')
12661266
]);
12671267
var code = value_music_name_ + ' = ' + functionName + '([' + statements_music_ + ']);\n';
12681268
return code;
@@ -1299,7 +1299,7 @@ Blockly.JavaScript['buzzer_music_play'] = function (block) {
12991299
var statements_music_ = Blockly.JavaScript.statementToCode(block, 'music_');
13001300
var functionName = Blockly.JavaScript.provideFunction_(
13011301
'buzzer_music', ['function ' + Blockly.JavaScript.FUNCTION_NAME_PLACEHOLDER_ + '(m) {',
1302-
_buzzer_music.toString().replace('function _buzzer_music(m) {\n', '')
1302+
_buzzer_music.toString().replace(/function _buzzer_music\(m\) {\r?\n/, '')
13031303
]);
13041304
var code = variable_var_ + '.play(' + functionName + '([' + statements_music_ + ']).notes ,' + functionName + '([' + statements_music_ + ']).tempos );\n';
13051305
return code;

0 commit comments

Comments
 (0)