Commit b8e8a013 authored by Evan W. Patton's avatar Evan W. Patton Committed by Jeffrey Schiller

Fix miscellaneous issues in blocks editor code

Change-Id: I7af103cd19e4fee9b3d3d273700e1bbdd8ee30b8
parent 80143e2f
...@@ -362,7 +362,7 @@ Blockly.Blocks['lists_reverse'] = { ...@@ -362,7 +362,7 @@ Blockly.Blocks['lists_reverse'] = {
.appendField(Blockly.Msg.LANG_LISTS_REVERSE_INPUT_LIST); .appendField(Blockly.Msg.LANG_LISTS_REVERSE_INPUT_LIST);
this.setTooltip(Blockly.Msg.LANG_LISTS_REVERSE_TOOLTIP); this.setTooltip(Blockly.Msg.LANG_LISTS_REVERSE_TOOLTIP);
}, },
typeblock: [{ translatedName: Blockly.LANG_LISTS_REVERSE_TITLE_REVERSE }] typeblock: [{ translatedName: Blockly.Msg.LANG_LISTS_REVERSE_TITLE_REVERSE }]
} }
Blockly.Blocks['lists_to_csv_row'] = { Blockly.Blocks['lists_to_csv_row'] = {
......
...@@ -226,7 +226,7 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -226,7 +226,7 @@ Blockly.Msg.en.switch_language_to_english = {
'This block may only\n' + 'This block may only\n' +
'be used within a loop.'; 'be used within a loop.';
Blockly.Msg.LANG_CONTROLS_WHILE_HELPURL = '/reference/blocks/control.html#while';; Blockly.Msg.LANG_CONTROLS_WHILE_HELPURL = '/reference/blocks/control.html#while';
Blockly.Msg.LANG_CONTROLS_WHILE_TITLE = 'while'; Blockly.Msg.LANG_CONTROLS_WHILE_TITLE = 'while';
Blockly.Msg.LANG_CONTROLS_WHILE_INPUT_TEST = 'test'; Blockly.Msg.LANG_CONTROLS_WHILE_INPUT_TEST = 'test';
Blockly.Msg.LANG_CONTROLS_WHILE_INPUT_DO = 'do'; Blockly.Msg.LANG_CONTROLS_WHILE_INPUT_DO = 'do';
...@@ -235,7 +235,7 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -235,7 +235,7 @@ Blockly.Msg.en.switch_language_to_english = {
+ 'true.'; + 'true.';
Blockly.Msg.LANG_CONTROLS_CHOOSE_HELPURL = '/reference/blocks/control.html#choose'; Blockly.Msg.LANG_CONTROLS_CHOOSE_HELPURL = '/reference/blocks/control.html#choose';
Blockly.Msg.LANG_CONTROLS_CHOOSE_TITLE = 'if' Blockly.Msg.LANG_CONTROLS_CHOOSE_TITLE = 'if';
Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_TEST = ''; Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_TEST = '';
Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_THEN_RETURN = 'then'; Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_THEN_RETURN = 'then';
Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_ELSE_RETURN = 'else'; Blockly.Msg.LANG_CONTROLS_CHOOSE_INPUT_ELSE_RETURN = 'else';
...@@ -252,9 +252,9 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -252,9 +252,9 @@ Blockly.Msg.en.switch_language_to_english = {
Blockly.Msg.LANG_CONTROLS_DO_THEN_RETURN_COLLAPSED_TEXT = 'do/result'; Blockly.Msg.LANG_CONTROLS_DO_THEN_RETURN_COLLAPSED_TEXT = 'do/result';
Blockly.Msg.LANG_CONTROLS_DO_THEN_RETURN_TITLE = 'do result'; Blockly.Msg.LANG_CONTROLS_DO_THEN_RETURN_TITLE = 'do result';
Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_TITLE = 'evaluate but ignore result' Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_TITLE = 'evaluate but ignore result';
Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_HELPURL = '/reference/blocks/control.html#evaluate'; Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_HELPURL = '/reference/blocks/control.html#evaluate';
Blockly.Msg.LANG_CONTROLS_EVAL_BUT_COLLAPSED_TEXT = 'eval but ignore' Blockly.Msg.LANG_CONTROLS_EVAL_BUT_COLLAPSED_TEXT = 'eval but ignore';
Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_TOOLTIP = 'Runs the connected block of code and ignores the return value (if any). Useful if need to call a procedure with a return value but don\'t need the value.'; Blockly.Msg.LANG_CONTROLS_EVAL_BUT_IGNORE_TOOLTIP = 'Runs the connected block of code and ignores the return value (if any). Useful if need to call a procedure with a return value but don\'t need the value.';
/* [lyn, 10/14/13] Removed for now. May come back some day. /* [lyn, 10/14/13] Removed for now. May come back some day.
...@@ -273,7 +273,7 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -273,7 +273,7 @@ Blockly.Msg.en.switch_language_to_english = {
Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_TITLE = 'open another screen with start value'; Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_TITLE = 'open another screen with start value';
Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_INPUT_SCREENNAME = 'screenName'; Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_INPUT_SCREENNAME = 'screenName';
Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_INPUT_STARTVALUE = 'startValue'; Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_INPUT_STARTVALUE = 'startValue';
Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_COLLAPSED_TEXT = 'open screen with value' Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_COLLAPSED_TEXT = 'open screen with value';
Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_TOOLTIP = 'Opens a new screen in a multiple screen app and passes the ' Blockly.Msg.LANG_CONTROLS_OPEN_ANOTHER_SCREEN_WITH_START_VALUE_TOOLTIP = 'Opens a new screen in a multiple screen app and passes the '
+ 'start value to that screen.'; + 'start value to that screen.';
...@@ -286,19 +286,19 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -286,19 +286,19 @@ Blockly.Msg.en.switch_language_to_english = {
+ 'was opened, typically by another screen in a multiple-screen app. If no value was ' + 'was opened, typically by another screen in a multiple-screen app. If no value was '
+ 'passed, returns the empty text.'; + 'passed, returns the empty text.';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_HELPURL = '/reference/blocks/control.html#closescreen';; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_HELPURL = '/reference/blocks/control.html#closescreen';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_TITLE = 'close screen'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_TITLE = 'close screen';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_COLLAPSED_TEXT = 'close screen'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_COLLAPSED_TEXT = 'close screen';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_TOOLTIP = 'Close the current screen'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_TOOLTIP = 'Close the current screen';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_HELPURL = '/reference/blocks/control.html#closescreenwithvalue';; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_HELPURL = '/reference/blocks/control.html#closescreenwithvalue';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_TITLE = 'close screen with value'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_TITLE = 'close screen with value';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_INPUT_RESULT = 'result'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_INPUT_RESULT = 'result';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_COLLAPSED_TEXT = 'close screen with value'; Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_COLLAPSED_TEXT = 'close screen with value';
Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_TOOLTIP = 'Closes the current screen and returns a result to the ' Blockly.Msg.LANG_CONTROLS_CLOSE_SCREEN_WITH_VALUE_TOOLTIP = 'Closes the current screen and returns a result to the '
+ 'screen that opened this one.'; + 'screen that opened this one.';
Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_HELPURL = '/reference/blocks/control.html#closeapp';; Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_HELPURL = '/reference/blocks/control.html#closeapp';
Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_TITLE = 'close application'; Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_TITLE = 'close application';
Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_COLLAPSED_TEXT = 'close application'; Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_COLLAPSED_TEXT = 'close application';
Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_TOOLTIP = 'Closes all screens in this app and stops the app.'; Blockly.Msg.LANG_CONTROLS_CLOSE_APPLICATION_TOOLTIP = 'Closes all screens in this app and stops the app.';
...@@ -473,7 +473,7 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -473,7 +473,7 @@ Blockly.Msg.en.switch_language_to_english = {
Blockly.Msg.LANG_MATH_TRIG_HELPURL_ACOS = '/reference/blocks/math.html#acos'; Blockly.Msg.LANG_MATH_TRIG_HELPURL_ACOS = '/reference/blocks/math.html#acos';
Blockly.Msg.LANG_MATH_TRIG_TOOLTIP_ATAN = 'Provides the angle in the range (-90, +90)\n' + Blockly.Msg.LANG_MATH_TRIG_TOOLTIP_ATAN = 'Provides the angle in the range (-90, +90)\n' +
'degrees with the given tangent value.'; 'degrees with the given tangent value.';
ATAN : Blockly.Msg.LANG_MATH_TRIG_HELPURL_ATAN = '/reference/blocks/math.html#atan'; Blockly.Msg.LANG_MATH_TRIG_HELPURL_ATAN = '/reference/blocks/math.html#atan';
Blockly.Msg.LANG_MATH_TRIG_TOOLTIP_ATAN2 = 'Provides the angle in the range (-180, +180]\n' + Blockly.Msg.LANG_MATH_TRIG_TOOLTIP_ATAN2 = 'Provides the angle in the range (-180, +180]\n' +
'degrees with the given rectangular coordinates.'; 'degrees with the given rectangular coordinates.';
Blockly.Msg.LANG_MATH_TRIG_HELPURL_ATAN2 = '/reference/blocks/math.html#atan2'; Blockly.Msg.LANG_MATH_TRIG_HELPURL_ATAN2 = '/reference/blocks/math.html#atan2';
...@@ -778,7 +778,7 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -778,7 +778,7 @@ Blockly.Msg.en.switch_language_to_english = {
Blockly.Msg.LANG_LISTS_IS_IN_TITLE_IS_IN = 'is in list?'; Blockly.Msg.LANG_LISTS_IS_IN_TITLE_IS_IN = 'is in list?';
Blockly.Msg.LANG_LISTS_IS_IN_INPUT_THING = 'thing'; Blockly.Msg.LANG_LISTS_IS_IN_INPUT_THING = 'thing';
Blockly.Msg.LANG_LISTS_IS_IN_INPUT_LIST = 'list'; Blockly.Msg.LANG_LISTS_IS_IN_INPUT_LIST = 'list';
Blockly.Msg.LANG_LISTS_IS_IN_INPUT = 'is in list? thing %1 list %2' Blockly.Msg.LANG_LISTS_IS_IN_INPUT = 'is in list? thing %1 list %2';
Blockly.Msg.LANG_LISTS_IS_IN_TOOLTIP = 'Returns true if the the thing is an item in the list, and ' Blockly.Msg.LANG_LISTS_IS_IN_TOOLTIP = 'Returns true if the the thing is an item in the list, and '
+ 'false if not.'; + 'false if not.';
...@@ -1499,6 +1499,6 @@ Blockly.Msg.en.switch_language_to_english = { ...@@ -1499,6 +1499,6 @@ Blockly.Msg.en.switch_language_to_english = {
} }
}; };
// Initalize language definition to English // Initialize language definition to English
Blockly.Msg.en.switch_blockly_language_to_en.init(); Blockly.Msg.en.switch_blockly_language_to_en.init();
Blockly.Msg.en.switch_language_to_english.init(); Blockly.Msg.en.switch_language_to_english.init();
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment