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

Merge branch 'develop' of https://github.com/google/blockly into develop

Browse Source
This commit is contained in:
Sean Lip
2016-06-09 18:16:00 -07:00
parent 50ddbbaee4 ef417d7a60
commit 42a4a1ed8f
16 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/flyout.js
View File

@@ -569,7 +569,7 @@ Blockly.Flyout.prototype.show = function(xmlList) {
this.layoutBlocks_(blocks, gaps);
// IE 11 is an incompetant browser that fails to fire mouseout events.
// IE 11 is an incompetent browser that fails to fire mouseout events.
// When the mouse is over the background, deselect all blocks.
var deselectAll = function() {
var topBlocks = this.workspace_.getTopBlocks(false);
@@ -806,7 +806,7 @@ Blockly.Flyout.prototype.onMouseMoveBlock_ = function(e) {
Safari Mobile 6.0 and Chrome for Android 18.0 fire rogue mousemove events
on certain touch actions. Ignore events with these signatures.
This may result in a one-pixel blind spot in other browsers,
but this shouldn't be noticable. */
but this shouldn't be noticeable. */
e.stopPropagation();
return;
}

2
demos/blockfactory/factory.js
View File

@@ -656,7 +656,7 @@ function updatePreview() {
if (format == 'JSON') {
var json = JSON.parse(code);
Blockly.Blocks[json.id || UNNAMED] = {
Blockly.Blocks[json.type || UNNAMED] = {
init: function() {
this.jsonInit(json);
}

8
generators/dart/lists.js
View File

@@ -80,7 +80,7 @@ Blockly.Dart['lists_indexOf'] = function(block) {
var argument1 = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '[]';
var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
return [code, Blockly.Dart.ORDER_ADDITIVE];
};
Blockly.Dart['lists_getIndex'] = function(block) {
@@ -318,10 +318,10 @@ Blockly.Dart['lists_sort'] = function(block) {
var type = block.getFieldValue('TYPE');
var sortFunctionName = Blockly.Dart.provideFunction_(
'lists_sort',
['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
['List ' + Blockly.Dart.FUNCTION_NAME_PLACEHOLDER_ +
'(list, type, direction) {',
' var compareFuncs = {',
' "NUMERIC": (a, b) => direction * a.compareTo(b),',
' "NUMERIC": (a, b) => direction * a.compareTo(b),',
' "TEXT": (a, b) => direction * a.toString().compareTo(b.toString()),',
' "IGNORE_CASE": ',
' (a, b) => direction * ',
@@ -332,7 +332,7 @@ Blockly.Dart['lists_sort'] = function(block) {
' list.sort(compare);',
' return list;',
'}']);
return [sortFunctionName + '(' + listCode + ', ' +
return [sortFunctionName + '(' + listCode + ', ' +
'"' + type + '", ' + direction + ')',
Blockly.Dart.ORDER_UNARY_POSTFIX];
};

8
generators/dart/loops.js
View File

@@ -128,11 +128,11 @@ Blockly.Dart['controls_for'] = function(block) {
code += 'if (' + startVar + ' > ' + endVar + ') {\n';
code += Blockly.Dart.INDENT + incVar + ' = -' + incVar + ';\n';
code += '}\n';
code += 'for (' + variable0 + ' = ' + startVar + ';\n' +
' ' + incVar + ' >= 0 ? ' +
code += 'for (' + variable0 + ' = ' + startVar + '; ' +
incVar + ' >= 0 ? ' +
variable0 + ' <= ' + endVar + ' : ' +
variable0 + ' >= ' + endVar + ';\n' +
' ' + variable0 + ' += ' + incVar + ') {\n' +
variable0 + ' >= ' + endVar + '; ' +
variable0 + ' += ' + incVar + ') {\n' +
branch + '}\n';
}
return code;

2
generators/dart/text.js
View File

@@ -90,7 +90,7 @@ Blockly.Dart['text_indexOf'] = function(block) {
var argument1 = Blockly.Dart.valueToCode(block, 'VALUE',
Blockly.Dart.ORDER_UNARY_POSTFIX) || '\'\'';
var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
return [code, Blockly.Dart.ORDER_UNARY_POSTFIX];
return [code, Blockly.Dart.ORDER_ADDITIVE];
};
Blockly.Dart['text_charAt'] = function(block) {

2
generators/javascript/lists.js
View File

@@ -88,7 +88,7 @@ Blockly.JavaScript['lists_indexOf'] = function(block) {
var argument1 = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '[]';
var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
return [code, Blockly.JavaScript.ORDER_MEMBER];
return [code, Blockly.JavaScript.ORDER_ADDITION];
};
Blockly.JavaScript['lists_getIndex'] = function(block) {

8
generators/javascript/loops.js
View File

@@ -129,11 +129,11 @@ Blockly.JavaScript['controls_for'] = function(block) {
code += 'if (' + startVar + ' > ' + endVar + ') {\n';
code += Blockly.JavaScript.INDENT + incVar + ' = -' + incVar + ';\n';
code += '}\n';
code += 'for (' + variable0 + ' = ' + startVar + ';\n' +
' ' + incVar + ' >= 0 ? ' +
code += 'for (' + variable0 + ' = ' + startVar + '; ' +
incVar + ' >= 0 ? ' +
variable0 + ' <= ' + endVar + ' : ' +
variable0 + ' >= ' + endVar + ';\n' +
' ' + variable0 + ' += ' + incVar + ') {\n' +
variable0 + ' >= ' + endVar + '; ' +
variable0 + ' += ' + incVar + ') {\n' +
branch + '}\n';
}
return code;

2
generators/javascript/text.js
View File

@@ -95,7 +95,7 @@ Blockly.JavaScript['text_indexOf'] = function(block) {
var argument1 = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
return [code, Blockly.JavaScript.ORDER_MEMBER];
return [code, Blockly.JavaScript.ORDER_ADDITION];
};
Blockly.JavaScript['text_charAt'] = function(block) {

8
generators/php/lists.js
View File

@@ -104,7 +104,7 @@ Blockly.PHP['lists_indexOf'] = function(block) {
[ 'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($haystack, $needle) {',
' for ($index = 0; $index < count($haystack); $index++) {',
' if ($haystack[$index] == $needle) return $index+1;',
' if ($haystack[$index] == $needle) return $index + 1;',
' }',
' return 0;',
'}']);
@@ -116,7 +116,7 @@ Blockly.PHP['lists_indexOf'] = function(block) {
'($haystack, $needle) {',
' $last = 0;',
' for ($index = 0; $index < count($haystack); $index++) {',
' if ($haystack[$index] == $needle) $last = $index+1;',
' if ($haystack[$index] == $needle) $last = $index + 1;',
' }',
' return $last;',
'}']);
@@ -364,7 +364,7 @@ Blockly.PHP['lists_sort'] = function(block) {
var type = block.getFieldValue('TYPE');
var functionName = Blockly.PHP.provideFunction_(
'lists_sort', [
'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
'($list, $type, $direction) {',
' $sortCmpFuncs = array(',
' "NUMERIC" => "strnatcasecmp",',
@@ -379,7 +379,7 @@ Blockly.PHP['lists_sort'] = function(block) {
' }',
' return $list2;',
'}']);
var sortCode = functionName +
var sortCode = functionName +
'(' + listCode + ', "' + type + '", ' + direction + ')';
return [sortCode, Blockly.PHP.ORDER_FUNCTION_CALL];
};

8
generators/php/loops.js
View File

@@ -128,11 +128,11 @@ Blockly.PHP['controls_for'] = function(block) {
code += 'if (' + startVar + ' > ' + endVar + ') {\n';
code += Blockly.PHP.INDENT + incVar + ' = -' + incVar + ';\n';
code += '}\n';
code += 'for (' + variable0 + ' = ' + startVar + ';\n' +
' ' + incVar + ' >= 0 ? ' +
code += 'for (' + variable0 + ' = ' + startVar + '; ' +
incVar + ' >= 0 ? ' +
variable0 + ' <= ' + endVar + ' : ' +
variable0 + ' >= ' + endVar + ';\n' +
' ' + variable0 + ' += ' + incVar + ') {\n' +
variable0 + ' >= ' + endVar + '; ' +
variable0 + ' += ' + incVar + ') {\n' +
branch + '}\n';
}
return code;

3
generators/php/text.js
View File

@@ -103,7 +103,6 @@ Blockly.PHP['text_indexOf'] = function(block) {
Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
var argument1 = Blockly.PHP.valueToCode(block, 'VALUE',
Blockly.PHP.ORDER_FUNCTION_CALL) || '\'\'';
var code = operator + '(' + argument1 + ', ' + argument0 + ') + 1';
var functionName = Blockly.PHP.provideFunction_(
block.getFieldValue('END') == 'FIRST' ?
@@ -113,7 +112,7 @@ Blockly.PHP['text_indexOf'] = function(block) {
' $pos = ' + operator + '($text, $search);',
' return $pos === false ? 0 : $pos + 1;',
'}']);
code = functionName + '(' + argument1 + ', ' + argument0 + ')';
var code = functionName + '(' + argument1 + ', ' + argument0 + ')';
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
};

2
generators/python/text.js
View File

@@ -100,7 +100,7 @@ Blockly.Python['text_indexOf'] = function(block) {
var argument1 = Blockly.Python.valueToCode(block, 'VALUE',
Blockly.Python.ORDER_MEMBER) || '\'\'';
var code = argument1 + '.' + operator + '(' + argument0 + ') + 1';
return [code, Blockly.Python.ORDER_MEMBER];
return [code, Blockly.Python.ORDER_ADDITIVE];
};
Blockly.Python['text_charAt'] = function(block) {

3
msg/json/be-tarask.json
View File

@@ -276,6 +276,9 @@
"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
"LISTS_SORT_TITLE": "сартаваць %1 %2 %3",
"LISTS_SORT_TOOLTIP": "Сартаваць копію сьпісу.",
"LISTS_SORT_ORDER_ASCENDING": "па павелічэньні",
"LISTS_SORT_ORDER_DESCENDING": "па зьмяншэньні",
"LISTS_SORT_TYPE_NUMERIC": "як лікі",
"LISTS_SPLIT_LIST_FROM_TEXT": "стварыць сьпіс з тэксту",
"LISTS_SPLIT_TEXT_FROM_LIST": "стварыць тэкст са сьпісу",
"LISTS_SPLIT_WITH_DELIMITER": "з падзяляльнікам",

5
msg/json/es.json
View File

@@ -7,7 +7,8 @@
"Macofe",
"Codynguyen1116",
"Indiralena",
"Rubentl134"
"Rubentl134",
"Martineduardo"
]
},
"VARIABLES_DEFAULT_NAME": "elemento",
@@ -138,7 +139,7 @@
"MATH_IS_DIVISIBLE_BY": "es divisible por",
"MATH_IS_TOOLTIP": "Comprueba si un número es par, impar, primo, entero, positivo, negativo, o si es divisible por un número determinado. Devuelve verdadero o falso.",
"MATH_CHANGE_HELPURL": "https://en.wikipedia.org/wiki/Programming_idiom#Incrementing_a_counter",
"MATH_CHANGE_TITLE": "cambiar %1 por %2",
"MATH_CHANGE_TITLE": "añadir %2 a %1",
"MATH_CHANGE_TOOLTIP": "Añadir un número a la variable «%1».",
"MATH_ROUND_HELPURL": "https://es.wikipedia.org/wiki/Redondeo",
"MATH_ROUND_TOOLTIP": "Redondear un número hacia arriba o hacia abajo.",

4
msg/json/he.json
View File

@@ -143,12 +143,15 @@
"MATH_IS_POSITIVE": "חיובי",
"MATH_IS_NEGATIVE": "שלילי",
"MATH_IS_DIVISIBLE_BY": "מתחלק ב",
"MATH_CHANGE_TITLE": "שינוי %1 על־ידי %2",
"MATH_CHANGE_TOOLTIP": "הוסף מספר למשתנה '%1'.",
"MATH_ROUND_HELPURL": "https://he.wikipedia.org/wiki/עיגול_(אריתמטיקה)",
"MATH_ROUND_TOOLTIP": "עיגול מספר למעלה או למטה.",
"MATH_ROUND_OPERATOR_ROUND": "עיגול",
"MATH_ROUND_OPERATOR_ROUNDUP": "עיגול למעלה",
"MATH_ROUND_OPERATOR_ROUNDDOWN": "עיגול למטה",
"MATH_ONLIST_OPERATOR_SUM": "סכום של רשימה",
"MATH_ONLIST_TOOLTIP_SUM": "החזרת הסכום של המספרים ברשימה.",
"MATH_ONLIST_OPERATOR_MIN": "מינימום של רשימה",
"MATH_ONLIST_TOOLTIP_MIN": "תחזיר את המספר הקטן ביותר ברשימה.",
"MATH_ONLIST_OPERATOR_MAX": "מקסימום של רשימה",
@@ -157,6 +160,7 @@
"MATH_ONLIST_OPERATOR_MEDIAN": "חציון של רשימה",
"MATH_ONLIST_TOOLTIP_MEDIAN": "תחזיר את המספר החיצוני ביותר ברשימה.",
"MATH_ONLIST_OPERATOR_MODE": "שכיחי הרשימה",
"MATH_ONLIST_TOOLTIP_MODE": "החזרת רשימה של הפריטים הנפוצים ביותר ברשימה",
"MATH_ONLIST_OPERATOR_RANDOM": "פריט אקראי מרשימה",
"MATH_ONLIST_TOOLTIP_RANDOM": "תחזיר רכיב אקראי מרשימה.",
"MATH_MODULO_TITLE": "שארית החילוק %1 ÷ %2",

8
msg/json/uk.json
View File

@@ -290,6 +290,14 @@
"LISTS_GET_SUBLIST_END_LAST": "до останнього",
"LISTS_GET_SUBLIST_TAIL": "символу.",
"LISTS_GET_SUBLIST_TOOLTIP": "Створює копію вказаної частини списку.",
"LISTS_SORT_HELPURL": "https://github.com/google/blockly/wiki/Lists#sorting-a-list",
"LISTS_SORT_TITLE": "сортувати %3 %1 %2",
"LISTS_SORT_TOOLTIP": "Сортувати копію списку.",
"LISTS_SORT_ORDER_ASCENDING": "за зростанням",
"LISTS_SORT_ORDER_DESCENDING": "за спаданням",
"LISTS_SORT_TYPE_NUMERIC": "як числа",
"LISTS_SORT_TYPE_TEXT": "за абеткою",
"LISTS_SORT_TYPE_IGNORECASE": "за абеткою, ігноруючи регістр",
"LISTS_SPLIT_LIST_FROM_TEXT": "зробити з тексту список",
"LISTS_SPLIT_TEXT_FROM_LIST": "зробити зі списку текст",
"LISTS_SPLIT_WITH_DELIMITER": "з розділювачем",