Skip to content

Commit 8d806cd

Browse files
tanyaparkertanyaparker
committed
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging
2 parents d6a4184 + aed0f31 commit 8d806cd

File tree

865 files changed

+18031
-7369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

865 files changed

+18031
-7369
lines changed

‎dashboard/public/blockly-package/css/webapp.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
.droplet-palette-group-header.yellow {
2+
border-left: 10px solid #e0e053; }
3+
4+
.droplet-palette-group-header-selected.yellow {
5+
background-color: #e0e053; }
6+
17
#divWebapp {
28
overflow: hidden;
39
position: relative;
@@ -11,8 +17,6 @@
1117
overflow: hidden;
1218
top: 0px;
1319
left: 0px;
14-
width: 400px;
15-
height: 400px;
1620
z-index: -1; }
1721

1822
.debug-console {

‎dashboard/public/blockly-package/js/ar_sa/bounce.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ BlocklyApps.init = function(config) {
684684
BlocklyApps.editor = new droplet.Editor(document.getElementById('codeTextbox'), {
685685
mode: 'javascript',
686686
modeOptions: utils.generateDropletModeOptions(config.level.codeFunctions),
687-
palette: utils.generateDropletPalette(config.level.codeFunctions)
687+
palette: utils.generateDropletPalette(config.level.codeFunctions,
688+
config.level.categoryInfo)
688689
});
689690

690691
if (config.afterInject) {
@@ -11966,7 +11967,7 @@ exports.generateCodeAliases = function (codeFunctions, parentObjName) {
1196611967
/**
1196711968
* Generate a palette for the droplet editor based on some level data.
1196811969
*/
11969-
exports.generateDropletPalette = function (codeFunctions) {
11970+
exports.generateDropletPalette = function (codeFunctions, categoryInfo) {
1197011971
// TODO: figure out localization for droplet scenario
1197111972
var palette = [
1197211973
{
@@ -12056,14 +12057,16 @@ exports.generateDropletPalette = function (codeFunctions) {
1205612057
}
1205712058
];
1205812059

12059-
var appPaletteCategory = {
12060-
name: 'Actions',
12061-
color: 'blue',
12062-
blocks: []
12060+
var defCategoryInfo = {
12061+
'Actions': {
12062+
'color': 'blue',
12063+
'blocks': []
12064+
}
1206312065
};
12066+
categoryInfo = categoryInfo || defCategoryInfo;
1206412067

1206512068
if (codeFunctions) {
12066-
for (var i = 0, blockIndex = 0; i < codeFunctions.length; i++) {
12069+
for (var i = 0; i < codeFunctions.length; i++) {
1206712070
var cf = codeFunctions[i];
1206812071
if (cf.category === 'hidden') {
1206912072
continue;
@@ -12082,12 +12085,14 @@ exports.generateDropletPalette = function (codeFunctions) {
1208212085
block: block,
1208312086
title: cf.func
1208412087
};
12085-
appPaletteCategory.blocks[blockIndex] = blockPair;
12086-
blockIndex++;
12088+
categoryInfo[cf.category || 'Actions'].blocks.push(blockPair);
1208712089
}
1208812090
}
1208912091

12090-
palette.unshift(appPaletteCategory);
12092+
for (var category in categoryInfo) {
12093+
categoryInfo[category].name = category;
12094+
palette.unshift(categoryInfo[category]);
12095+
}
1209112096

1209212097
return palette;
1209312098
};
@@ -12113,10 +12118,13 @@ exports.generateDropletModeOptions = function (codeFunctions) {
1211312118

1211412119
if (codeFunctions) {
1211512120
for (var i = 0; i < codeFunctions.length; i++) {
12116-
if (codeFunctions[i].category === 'value') {
12121+
if (codeFunctions[i].type === 'value') {
1211712122
modeOptions.valueFunctions.push(codeFunctions[i].func);
1211812123
}
12119-
else if (codeFunctions[i].category !== 'hidden') {
12124+
else if (codeFunctions[i].type === 'either') {
12125+
modeOptions.eitherFunctions.push(codeFunctions[i].func);
12126+
}
12127+
else if (codeFunctions[i].type !== 'hidden') {
1212012128
modeOptions.blockFunctions.push(codeFunctions[i].func);
1212112129
}
1212212130
}

‎dashboard/public/blockly-package/js/ar_sa/bounce.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/public/blockly-package/js/ar_sa/calc.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ BlocklyApps.init = function(config) {
684684
BlocklyApps.editor = new droplet.Editor(document.getElementById('codeTextbox'), {
685685
mode: 'javascript',
686686
modeOptions: utils.generateDropletModeOptions(config.level.codeFunctions),
687-
palette: utils.generateDropletPalette(config.level.codeFunctions)
687+
palette: utils.generateDropletPalette(config.level.codeFunctions,
688+
config.level.categoryInfo)
688689
});
689690

690691
if (config.afterInject) {
@@ -10622,7 +10623,7 @@ exports.generateCodeAliases = function (codeFunctions, parentObjName) {
1062210623
/**
1062310624
* Generate a palette for the droplet editor based on some level data.
1062410625
*/
10625-
exports.generateDropletPalette = function (codeFunctions) {
10626+
exports.generateDropletPalette = function (codeFunctions, categoryInfo) {
1062610627
// TODO: figure out localization for droplet scenario
1062710628
var palette = [
1062810629
{
@@ -10712,14 +10713,16 @@ exports.generateDropletPalette = function (codeFunctions) {
1071210713
}
1071310714
];
1071410715

10715-
var appPaletteCategory = {
10716-
name: 'Actions',
10717-
color: 'blue',
10718-
blocks: []
10716+
var defCategoryInfo = {
10717+
'Actions': {
10718+
'color': 'blue',
10719+
'blocks': []
10720+
}
1071910721
};
10722+
categoryInfo = categoryInfo || defCategoryInfo;
1072010723

1072110724
if (codeFunctions) {
10722-
for (var i = 0, blockIndex = 0; i < codeFunctions.length; i++) {
10725+
for (var i = 0; i < codeFunctions.length; i++) {
1072310726
var cf = codeFunctions[i];
1072410727
if (cf.category === 'hidden') {
1072510728
continue;
@@ -10738,12 +10741,14 @@ exports.generateDropletPalette = function (codeFunctions) {
1073810741
block: block,
1073910742
title: cf.func
1074010743
};
10741-
appPaletteCategory.blocks[blockIndex] = blockPair;
10742-
blockIndex++;
10744+
categoryInfo[cf.category || 'Actions'].blocks.push(blockPair);
1074310745
}
1074410746
}
1074510747

10746-
palette.unshift(appPaletteCategory);
10748+
for (var category in categoryInfo) {
10749+
categoryInfo[category].name = category;
10750+
palette.unshift(categoryInfo[category]);
10751+
}
1074710752

1074810753
return palette;
1074910754
};
@@ -10769,10 +10774,13 @@ exports.generateDropletModeOptions = function (codeFunctions) {
1076910774

1077010775
if (codeFunctions) {
1077110776
for (var i = 0; i < codeFunctions.length; i++) {
10772-
if (codeFunctions[i].category === 'value') {
10777+
if (codeFunctions[i].type === 'value') {
1077310778
modeOptions.valueFunctions.push(codeFunctions[i].func);
1077410779
}
10775-
else if (codeFunctions[i].category !== 'hidden') {
10780+
else if (codeFunctions[i].type === 'either') {
10781+
modeOptions.eitherFunctions.push(codeFunctions[i].func);
10782+
}
10783+
else if (codeFunctions[i].type !== 'hidden') {
1077610784
modeOptions.blockFunctions.push(codeFunctions[i].func);
1077710785
}
1077810786
}

‎dashboard/public/blockly-package/js/ar_sa/calc.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/public/blockly-package/js/ar_sa/eval.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ BlocklyApps.init = function(config) {
684684
BlocklyApps.editor = new droplet.Editor(document.getElementById('codeTextbox'), {
685685
mode: 'javascript',
686686
modeOptions: utils.generateDropletModeOptions(config.level.codeFunctions),
687-
palette: utils.generateDropletPalette(config.level.codeFunctions)
687+
palette: utils.generateDropletPalette(config.level.codeFunctions,
688+
config.level.categoryInfo)
688689
});
689690

690691
if (config.afterInject) {
@@ -13889,7 +13890,7 @@ exports.generateCodeAliases = function (codeFunctions, parentObjName) {
1388913890
/**
1389013891
* Generate a palette for the droplet editor based on some level data.
1389113892
*/
13892-
exports.generateDropletPalette = function (codeFunctions) {
13893+
exports.generateDropletPalette = function (codeFunctions, categoryInfo) {
1389313894
// TODO: figure out localization for droplet scenario
1389413895
var palette = [
1389513896
{
@@ -13979,14 +13980,16 @@ exports.generateDropletPalette = function (codeFunctions) {
1397913980
}
1398013981
];
1398113982

13982-
var appPaletteCategory = {
13983-
name: 'Actions',
13984-
color: 'blue',
13985-
blocks: []
13983+
var defCategoryInfo = {
13984+
'Actions': {
13985+
'color': 'blue',
13986+
'blocks': []
13987+
}
1398613988
};
13989+
categoryInfo = categoryInfo || defCategoryInfo;
1398713990

1398813991
if (codeFunctions) {
13989-
for (var i = 0, blockIndex = 0; i < codeFunctions.length; i++) {
13992+
for (var i = 0; i < codeFunctions.length; i++) {
1399013993
var cf = codeFunctions[i];
1399113994
if (cf.category === 'hidden') {
1399213995
continue;
@@ -14005,12 +14008,14 @@ exports.generateDropletPalette = function (codeFunctions) {
1400514008
block: block,
1400614009
title: cf.func
1400714010
};
14008-
appPaletteCategory.blocks[blockIndex] = blockPair;
14009-
blockIndex++;
14011+
categoryInfo[cf.category || 'Actions'].blocks.push(blockPair);
1401014012
}
1401114013
}
1401214014

14013-
palette.unshift(appPaletteCategory);
14015+
for (var category in categoryInfo) {
14016+
categoryInfo[category].name = category;
14017+
palette.unshift(categoryInfo[category]);
14018+
}
1401414019

1401514020
return palette;
1401614021
};
@@ -14036,10 +14041,13 @@ exports.generateDropletModeOptions = function (codeFunctions) {
1403614041

1403714042
if (codeFunctions) {
1403814043
for (var i = 0; i < codeFunctions.length; i++) {
14039-
if (codeFunctions[i].category === 'value') {
14044+
if (codeFunctions[i].type === 'value') {
1404014045
modeOptions.valueFunctions.push(codeFunctions[i].func);
1404114046
}
14042-
else if (codeFunctions[i].category !== 'hidden') {
14047+
else if (codeFunctions[i].type === 'either') {
14048+
modeOptions.eitherFunctions.push(codeFunctions[i].func);
14049+
}
14050+
else if (codeFunctions[i].type !== 'hidden') {
1404314051
modeOptions.blockFunctions.push(codeFunctions[i].func);
1404414052
}
1404514053
}

‎dashboard/public/blockly-package/js/ar_sa/eval.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/public/blockly-package/js/ar_sa/flappy.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ BlocklyApps.init = function(config) {
684684
BlocklyApps.editor = new droplet.Editor(document.getElementById('codeTextbox'), {
685685
mode: 'javascript',
686686
modeOptions: utils.generateDropletModeOptions(config.level.codeFunctions),
687-
palette: utils.generateDropletPalette(config.level.codeFunctions)
687+
palette: utils.generateDropletPalette(config.level.codeFunctions,
688+
config.level.categoryInfo)
688689
});
689690

690691
if (config.afterInject) {
@@ -11790,7 +11791,7 @@ exports.generateCodeAliases = function (codeFunctions, parentObjName) {
1179011791
/**
1179111792
* Generate a palette for the droplet editor based on some level data.
1179211793
*/
11793-
exports.generateDropletPalette = function (codeFunctions) {
11794+
exports.generateDropletPalette = function (codeFunctions, categoryInfo) {
1179411795
// TODO: figure out localization for droplet scenario
1179511796
var palette = [
1179611797
{
@@ -11880,14 +11881,16 @@ exports.generateDropletPalette = function (codeFunctions) {
1188011881
}
1188111882
];
1188211883

11883-
var appPaletteCategory = {
11884-
name: 'Actions',
11885-
color: 'blue',
11886-
blocks: []
11884+
var defCategoryInfo = {
11885+
'Actions': {
11886+
'color': 'blue',
11887+
'blocks': []
11888+
}
1188711889
};
11890+
categoryInfo = categoryInfo || defCategoryInfo;
1188811891

1188911892
if (codeFunctions) {
11890-
for (var i = 0, blockIndex = 0; i < codeFunctions.length; i++) {
11893+
for (var i = 0; i < codeFunctions.length; i++) {
1189111894
var cf = codeFunctions[i];
1189211895
if (cf.category === 'hidden') {
1189311896
continue;
@@ -11906,12 +11909,14 @@ exports.generateDropletPalette = function (codeFunctions) {
1190611909
block: block,
1190711910
title: cf.func
1190811911
};
11909-
appPaletteCategory.blocks[blockIndex] = blockPair;
11910-
blockIndex++;
11912+
categoryInfo[cf.category || 'Actions'].blocks.push(blockPair);
1191111913
}
1191211914
}
1191311915

11914-
palette.unshift(appPaletteCategory);
11916+
for (var category in categoryInfo) {
11917+
categoryInfo[category].name = category;
11918+
palette.unshift(categoryInfo[category]);
11919+
}
1191511920

1191611921
return palette;
1191711922
};
@@ -11937,10 +11942,13 @@ exports.generateDropletModeOptions = function (codeFunctions) {
1193711942

1193811943
if (codeFunctions) {
1193911944
for (var i = 0; i < codeFunctions.length; i++) {
11940-
if (codeFunctions[i].category === 'value') {
11945+
if (codeFunctions[i].type === 'value') {
1194111946
modeOptions.valueFunctions.push(codeFunctions[i].func);
1194211947
}
11943-
else if (codeFunctions[i].category !== 'hidden') {
11948+
else if (codeFunctions[i].type === 'either') {
11949+
modeOptions.eitherFunctions.push(codeFunctions[i].func);
11950+
}
11951+
else if (codeFunctions[i].type !== 'hidden') {
1194411952
modeOptions.blockFunctions.push(codeFunctions[i].func);
1194511953
}
1194611954
}

‎dashboard/public/blockly-package/js/ar_sa/flappy.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/public/blockly-package/js/ar_sa/jigsaw.js

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,8 @@ BlocklyApps.init = function(config) {
684684
BlocklyApps.editor = new droplet.Editor(document.getElementById('codeTextbox'), {
685685
mode: 'javascript',
686686
modeOptions: utils.generateDropletModeOptions(config.level.codeFunctions),
687-
palette: utils.generateDropletPalette(config.level.codeFunctions)
687+
palette: utils.generateDropletPalette(config.level.codeFunctions,
688+
config.level.categoryInfo)
688689
});
689690

690691
if (config.afterInject) {
@@ -10285,7 +10286,7 @@ exports.generateCodeAliases = function (codeFunctions, parentObjName) {
1028510286
/**
1028610287
* Generate a palette for the droplet editor based on some level data.
1028710288
*/
10288-
exports.generateDropletPalette = function (codeFunctions) {
10289+
exports.generateDropletPalette = function (codeFunctions, categoryInfo) {
1028910290
// TODO: figure out localization for droplet scenario
1029010291
var palette = [
1029110292
{
@@ -10375,14 +10376,16 @@ exports.generateDropletPalette = function (codeFunctions) {
1037510376
}
1037610377
];
1037710378

10378-
var appPaletteCategory = {
10379-
name: 'Actions',
10380-
color: 'blue',
10381-
blocks: []
10379+
var defCategoryInfo = {
10380+
'Actions': {
10381+
'color': 'blue',
10382+
'blocks': []
10383+
}
1038210384
};
10385+
categoryInfo = categoryInfo || defCategoryInfo;
1038310386

1038410387
if (codeFunctions) {
10385-
for (var i = 0, blockIndex = 0; i < codeFunctions.length; i++) {
10388+
for (var i = 0; i < codeFunctions.length; i++) {
1038610389
var cf = codeFunctions[i];
1038710390
if (cf.category === 'hidden') {
1038810391
continue;
@@ -10401,12 +10404,14 @@ exports.generateDropletPalette = function (codeFunctions) {
1040110404
block: block,
1040210405
title: cf.func
1040310406
};
10404-
appPaletteCategory.blocks[blockIndex] = blockPair;
10405-
blockIndex++;
10407+
categoryInfo[cf.category || 'Actions'].blocks.push(blockPair);
1040610408
}
1040710409
}
1040810410

10409-
palette.unshift(appPaletteCategory);
10411+
for (var category in categoryInfo) {
10412+
categoryInfo[category].name = category;
10413+
palette.unshift(categoryInfo[category]);
10414+
}
1041010415

1041110416
return palette;
1041210417
};
@@ -10432,10 +10437,13 @@ exports.generateDropletModeOptions = function (codeFunctions) {
1043210437

1043310438
if (codeFunctions) {
1043410439
for (var i = 0; i < codeFunctions.length; i++) {
10435-
if (codeFunctions[i].category === 'value') {
10440+
if (codeFunctions[i].type === 'value') {
1043610441
modeOptions.valueFunctions.push(codeFunctions[i].func);
1043710442
}
10438-
else if (codeFunctions[i].category !== 'hidden') {
10443+
else if (codeFunctions[i].type === 'either') {
10444+
modeOptions.eitherFunctions.push(codeFunctions[i].func);
10445+
}
10446+
else if (codeFunctions[i].type !== 'hidden') {
1043910447
modeOptions.blockFunctions.push(codeFunctions[i].func);
1044010448
}
1044110449
}

‎dashboard/public/blockly-package/js/ar_sa/jigsaw.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)