Skip to content

Commit 049b430

Browse files
deploy-code-orgdeploy-code-org
committed
Automatically built.
commit b78b3b0 Merge: a41c493 db84d17 Author: cpirich <[email protected]> Date: Mon Dec 15 11:38:36 2014 -0800 Merge pull request code-dot-org#865 from code-dot-org/webapp_changes Webapp changes commit a41c493 Merge: 9651d2c 2a5a4d0 Author: Geoffrey Elliott <[email protected]> Date: Mon Dec 15 10:44:45 2014 -0800 Merge branch 'test' of github.com:code-dot-org/code-dot-org into staging commit 2a5a4d0 Merge: 8d7183a 3d13e29 Author: Geoffrey Elliott <[email protected]> Date: Mon Dec 15 10:44:24 2014 -0800 Merge branch 'production' of github.com:code-dot-org/code-dot-org into test commit 9651d2c Author: Continuous Integration <[email protected]> Date: Mon Dec 15 18:41:38 2014 +0000 /donate content update commit 3d13e29 Author: Continuous Integration <[email protected]> Date: Mon Dec 15 18:38:50 2014 +0000 Leaderboard for cities. commit 14d2403 Author: Continuous Integration <[email protected]> Date: Mon Dec 15 18:36:35 2014 +0000 Update 2 at a time with our smaller set of instances in play now. commit 995dabb Author: Continuous Integration <[email protected]> Date: Mon Dec 15 18:20:19 2014 +0000 Dropbox and GSheet changes.
1 parent b78b3b0 commit 049b430

File tree

903 files changed

+4669
-11706
lines changed

Some content is hidden

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

903 files changed

+4669
-11706
lines changed

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,26 @@ html[dir="RTL"] .farSide {
4545
bottom: 10px;
4646
margin-left: 415px; }
4747

48+
div.droplet-palette-group-header {
49+
font-family: 'Gotham 4r', sans-serif;
50+
font-weight: normal; }
51+
52+
div.droplet-palette-group-header:active {
53+
color: black; }
54+
55+
div.droplet-palette-group-header-selected {
56+
font-weight: 400;
57+
color: black; }
58+
59+
.droplet-palette-group-header.yellow {
60+
border-left: 10px solid #e0e053; }
61+
62+
.droplet-palette-group-header-selected.yellow {
63+
background-color: #e0e053; }
64+
65+
.droplet-wrapper-div {
66+
outline-style: none; }
67+
4868
#show-code-button {
4969
background-color: #b9bf15;
5070
border-color: #b9bf15;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
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-
71
#divWebapp {
82
overflow: hidden;
93
position: relative;

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -696,18 +696,6 @@ BlocklyApps.init = function(config) {
696696

697697
if (config.level.startBlocks) {
698698
BlocklyApps.editor.setValue(config.level.startBlocks);
699-
} else {
700-
var startText = '// ' + msg.typeHint() + '\n';
701-
var codeFunctions = config.level.codeFunctions;
702-
// Insert hint text from level codeFunctions into editCode area
703-
if (codeFunctions) {
704-
var hintText = '';
705-
for (var i = 0; i < codeFunctions.length; i++) {
706-
hintText += " " + codeFunctions[i].func + "();";
707-
}
708-
startText += '// ' + msg.typeFuncs().replace('%1', hintText) + '\n';
709-
}
710-
BlocklyApps.editor.setValue(startText);
711699
}
712700
});
713701
}
@@ -4487,7 +4475,7 @@ exports.workspaceCode = function(blockly) {
44874475
exports.marshalNativeToInterpreter = function (interpreter, nativeVar, nativeParentObj, maxDepth) {
44884476
var retVal;
44894477
if (typeof maxDepth === "undefined") {
4490-
maxDepth = 4; // default to 4 levels of depth
4478+
maxDepth = Infinity; // default to inifinite levels of depth
44914479
}
44924480
if (maxDepth === 0) {
44934481
return interpreter.createPrimitive(undefined);
@@ -4535,11 +4523,11 @@ exports.marshalNativeToInterpreter = function (interpreter, nativeVar, nativePar
45354523
/**
45364524
* Generate a native function wrapper for use with the JS interpreter.
45374525
*/
4538-
exports.makeNativeMemberFunction = function (interpreter, nativeFunc, nativeParentObj) {
4526+
exports.makeNativeMemberFunction = function (interpreter, nativeFunc, nativeParentObj, maxDepth) {
45394527
return function() {
45404528
// Call the native function:
45414529
var nativeRetVal = nativeFunc.apply(nativeParentObj, arguments);
4542-
return exports.marshalNativeToInterpreter(interpreter, nativeRetVal, null);
4530+
return exports.marshalNativeToInterpreter(interpreter, nativeRetVal, null, maxDepth);
45434531
};
45444532
};
45454533

@@ -11891,7 +11879,7 @@ with (locals || {}) { (function(){
1189111879
var msg = require('../../locale/ar_sa/common');
1189211880
var hideRunButton = locals.hideRunButton || false;
1189311881
; buf.push('\n\n<div id="rotateContainer" style="background-image: url(https://github.com/',%20escape((6,%20%20assetUrl('media/mobile_tutorial_turnphone.png') )), ')">\n <div id="rotateText">\n <p>', escape((8, msg.rotateText() )), '<br>', escape((8, msg.orientationLock() )), '</p>\n </div>\n</div>\n\n');12; var instructions = function() {; buf.push(' <div id="bubble" class="clearfix">\n <table id="prompt-table">\n <tr>\n <td id="prompt-icon-cell">\n <img id="prompt-icon"/>\n </td>\n <td id="prompt-cell">\n <p id="prompt">\n </p>\n </td>\n </tr>\n </table>\n <div id="ani-gif-preview-wrapper">\n <div id="ani-gif-preview">\n <img id="play-button" src="', escape((26, assetUrl('media/play-circle.png') )), '"/>\n </div>\n </div>\n </div>\n');30; };; buf.push('\n');31; // A spot for the server to inject some HTML for help content.
11894-
var helpArea = function(html) {; buf.push(' ');32; if (html) {; buf.push(' <div id="helpArea">\n ', (33, html ), '\n </div>\n ');35; }; buf.push('');35; };; buf.push('\n<div id="visualizationColumn">\n <div id="visualization">\n ', (38, data.visualization ), '\n </div>\n\n <div id="belowVisualization">\n\n <div id="gameButtons">\n <button id="runButton" class="launch blocklyLaunch ', escape((44, hideRunButton ? 'invisible' : '')), '">\n <div>', escape((45, msg.runProgram() )), '</div>\n <img src="', escape((46, assetUrl('media/1x1.gif') )), '" class="run26"/>\n </button>\n <button id="resetButton" class="launch blocklyLaunch" style="display: none">\n <div>', escape((49, msg.resetProgram() )), '</div>\n <img src="', escape((50, assetUrl('media/1x1.gif') )), '" class="reset26"/>\n </button>\n ');52; if (data.controls) { ; buf.push('\n ', (53, data.controls ), '\n ');54; } ; buf.push('\n ');55; if (data.extraControlRows) { ; buf.push('\n ', (56, data.extraControlRows ), '\n ');57; } ; buf.push('\n </div>\n\n ');60; instructions() ; buf.push('\n ');61; helpArea(data.helpHtml) ; buf.push('\n\n </div>\n</div>\n\n');66; if (data.editCode) { ; buf.push('\n <div id="codeWorkspace">\n');68; } else { ; buf.push('\n <div id="blockly">\n');70; } ; buf.push('\n <div id="headers" dir="', escape((71, data.localeDirection )), '">\n <div id="toolbox-header" class="blockly-header"><span>', escape((72, msg.toolboxHeader() )), '</span></div>\n <div id="workspace-header" class="blockly-header">\n <span id="workspace-header-span">', escape((74, msg.workspaceHeader())), ' </span>\n <div id="blockCounter">\n <div id="blockUsed" class=', escape((76, data.blockCounterClass )), '>\n ', escape((77, data.blockUsed )), '\n </div>\n <span>&nbsp;/</span>\n <span id="idealBlockNumber">', escape((80, data.idealBlockNumber )), '</span>\n </div>\n </div>\n <div id="show-code-header" class="blockly-header"><span>', escape((83, msg.showCodeHeader() )), '</span></div>\n </div>\n ');85; if (data.editCode) { ; buf.push('\n <div id="codeTextbox" contenteditable spellcheck=false></div>\n ');87; } ; buf.push('\n</div>\n\n<div class="clear"></div>\n'); })();
11882+
var helpArea = function(html) {; buf.push(' ');32; if (html) {; buf.push(' <div id="helpArea">\n ', (33, html ), '\n </div>\n ');35; }; buf.push('');35; };; buf.push('\n<div id="visualizationColumn">\n <div id="visualization">\n ', (38, data.visualization ), '\n </div>\n\n <div id="belowVisualization">\n\n <div id="gameButtons">\n <button id="runButton" class="launch blocklyLaunch ', escape((44, hideRunButton ? 'invisible' : '')), '">\n <div>', escape((45, msg.runProgram() )), '</div>\n <img src="', escape((46, assetUrl('media/1x1.gif') )), '" class="run26"/>\n </button>\n <button id="resetButton" class="launch blocklyLaunch" style="display: none">\n <div>', escape((49, msg.resetProgram() )), '</div>\n <img src="', escape((50, assetUrl('media/1x1.gif') )), '" class="reset26"/>\n </button>\n ');52; if (data.controls) { ; buf.push('\n ', (53, data.controls ), '\n ');54; } ; buf.push('\n ');55; if (data.extraControlRows) { ; buf.push('\n ', (56, data.extraControlRows ), '\n ');57; } ; buf.push('\n </div>\n\n ');60; instructions() ; buf.push('\n ');61; helpArea(data.helpHtml) ; buf.push('\n\n </div>\n</div>\n\n');66; if (data.editCode) { ; buf.push('\n <div id="codeWorkspace">\n');68; } else { ; buf.push('\n <div id="blockly">\n');70; } ; buf.push('\n <div id="headers" dir="', escape((71, data.localeDirection )), '">\n <div id="toolbox-header" class="blockly-header"><span>', escape((72, msg.toolboxHeader() )), '</span></div>\n <div id="workspace-header" class="blockly-header">\n <span id="workspace-header-span">', escape((74, msg.workspaceHeader())), ' </span>\n <div id="blockCounter">\n <div id="blockUsed" class=', escape((76, data.blockCounterClass )), '>\n ', escape((77, data.blockUsed )), '\n </div>\n <span>&nbsp;/</span>\n <span id="idealBlockNumber">', escape((80, data.idealBlockNumber )), '</span>\n </div>\n </div>\n <div id="show-code-header" class="blockly-header"><span>', escape((83, msg.showCodeHeader() )), '</span></div>\n </div>\n ');85; if (data.editCode) { ; buf.push('\n <div id="codeTextbox"></div>\n ');87; } ; buf.push('\n</div>\n\n<div class="clear"></div>\n'); })();
1189511883
}
1189611884
return buf.join('');
1189711885
};
@@ -12806,10 +12794,6 @@ exports.savedToGallery = function(d){return "تم الحفط في المعرض!"
1280612794

1280712795
exports.shareFailure = function(d){return "عذراً، لا يمكن أن نشارك هذا البرنامج."};
1280812796

12809-
exports.typeFuncs = function(d){return "الدوال المتاحة: %1"};
12810-
12811-
exports.typeHint = function(d){return "تذكر أن الأقواس والفواصل المنقوطة ضرورية."};
12812-
1281312797
exports.workspaceHeader = function(d){return "أجمع القطع هنا: "};
1281412798

1281512799
exports.workspaceHeaderJavaScript = function(d){return "أكتب الكود البرمجي جافاسكريبت هنا"};

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

Lines changed: 6 additions & 6 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: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -696,18 +696,6 @@ BlocklyApps.init = function(config) {
696696

697697
if (config.level.startBlocks) {
698698
BlocklyApps.editor.setValue(config.level.startBlocks);
699-
} else {
700-
var startText = '// ' + msg.typeHint() + '\n';
701-
var codeFunctions = config.level.codeFunctions;
702-
// Insert hint text from level codeFunctions into editCode area
703-
if (codeFunctions) {
704-
var hintText = '';
705-
for (var i = 0; i < codeFunctions.length; i++) {
706-
hintText += " " + codeFunctions[i].func + "();";
707-
}
708-
startText += '// ' + msg.typeFuncs().replace('%1', hintText) + '\n';
709-
}
710-
BlocklyApps.editor.setValue(startText);
711699
}
712700
});
713701
}
@@ -2667,7 +2655,7 @@ exports.workspaceCode = function(blockly) {
26672655
exports.marshalNativeToInterpreter = function (interpreter, nativeVar, nativeParentObj, maxDepth) {
26682656
var retVal;
26692657
if (typeof maxDepth === "undefined") {
2670-
maxDepth = 4; // default to 4 levels of depth
2658+
maxDepth = Infinity; // default to inifinite levels of depth
26712659
}
26722660
if (maxDepth === 0) {
26732661
return interpreter.createPrimitive(undefined);
@@ -2715,11 +2703,11 @@ exports.marshalNativeToInterpreter = function (interpreter, nativeVar, nativePar
27152703
/**
27162704
* Generate a native function wrapper for use with the JS interpreter.
27172705
*/
2718-
exports.makeNativeMemberFunction = function (interpreter, nativeFunc, nativeParentObj) {
2706+
exports.makeNativeMemberFunction = function (interpreter, nativeFunc, nativeParentObj, maxDepth) {
27192707
return function() {
27202708
// Call the native function:
27212709
var nativeRetVal = nativeFunc.apply(nativeParentObj, arguments);
2722-
return exports.marshalNativeToInterpreter(interpreter, nativeRetVal, null);
2710+
return exports.marshalNativeToInterpreter(interpreter, nativeRetVal, null, maxDepth);
27232711
};
27242712
};
27252713

@@ -10584,7 +10572,7 @@ with (locals || {}) { (function(){
1058410572
var msg = require('../../locale/ar_sa/common');
1058510573
var hideRunButton = locals.hideRunButton || false;
1058610574
; buf.push('\n\n<div id="rotateContainer" style="background-image: url(https://github.com/'%3C/span%3E%3Cspan%20class=pl-kos%3E,%3C/span%3E%20%3Cspan%20class=pl-s1%3Eescape%3C/span%3E%3Cspan%20class=pl-kos%3E(%3C/span%3E%3Cspan%20class=pl-kos%3E(%3C/span%3E%3Cspan%20class=pl-c1%3E6%3C/span%3E%3Cspan%20class=pl-kos%3E,%3C/span%3E%20%20%3Cspan%20class=pl-en%3EassetUrl%3C/span%3E%3Cspan%20class=pl-kos%3E(%3C/span%3E%3Cspan%20class=pl-s%3E'media/mobile_tutorial_turnphone.png'%3C/span%3E%3Cspan%20class=pl-kos%3E) )), ')">\n <div id="rotateText">\n <p>', escape((8, msg.rotateText() )), '<br>', escape((8, msg.orientationLock() )), '</p>\n </div>\n</div>\n\n');12; var instructions = function() {; buf.push(' <div id="bubble" class="clearfix">\n <table id="prompt-table">\n <tr>\n <td id="prompt-icon-cell">\n <img id="prompt-icon"/>\n </td>\n <td id="prompt-cell">\n <p id="prompt">\n </p>\n </td>\n </tr>\n </table>\n <div id="ani-gif-preview-wrapper">\n <div id="ani-gif-preview">\n <img id="play-button" src="', escape((26, assetUrl('media/play-circle.png') )), '"/>\n </div>\n </div>\n </div>\n');30; };; buf.push('\n');31; // A spot for the server to inject some HTML for help content.
10587-
var helpArea = function(html) {; buf.push(' ');32; if (html) {; buf.push(' <div id="helpArea">\n ', (33, html ), '\n </div>\n ');35; }; buf.push('');35; };; buf.push('\n<div id="visualizationColumn">\n <div id="visualization">\n ', (38, data.visualization ), '\n </div>\n\n <div id="belowVisualization">\n\n <div id="gameButtons">\n <button id="runButton" class="launch blocklyLaunch ', escape((44, hideRunButton ? 'invisible' : '')), '">\n <div>', escape((45, msg.runProgram() )), '</div>\n <img src="', escape((46, assetUrl('media/1x1.gif') )), '" class="run26"/>\n </button>\n <button id="resetButton" class="launch blocklyLaunch" style="display: none">\n <div>', escape((49, msg.resetProgram() )), '</div>\n <img src="', escape((50, assetUrl('media/1x1.gif') )), '" class="reset26"/>\n </button>\n ');52; if (data.controls) { ; buf.push('\n ', (53, data.controls ), '\n ');54; } ; buf.push('\n ');55; if (data.extraControlRows) { ; buf.push('\n ', (56, data.extraControlRows ), '\n ');57; } ; buf.push('\n </div>\n\n ');60; instructions() ; buf.push('\n ');61; helpArea(data.helpHtml) ; buf.push('\n\n </div>\n</div>\n\n');66; if (data.editCode) { ; buf.push('\n <div id="codeWorkspace">\n');68; } else { ; buf.push('\n <div id="blockly">\n');70; } ; buf.push('\n <div id="headers" dir="', escape((71, data.localeDirection )), '">\n <div id="toolbox-header" class="blockly-header"><span>', escape((72, msg.toolboxHeader() )), '</span></div>\n <div id="workspace-header" class="blockly-header">\n <span id="workspace-header-span">', escape((74, msg.workspaceHeader())), ' </span>\n <div id="blockCounter">\n <div id="blockUsed" class=', escape((76, data.blockCounterClass )), '>\n ', escape((77, data.blockUsed )), '\n </div>\n <span>&nbsp;/</span>\n <span id="idealBlockNumber">', escape((80, data.idealBlockNumber )), '</span>\n </div>\n </div>\n <div id="show-code-header" class="blockly-header"><span>', escape((83, msg.showCodeHeader() )), '</span></div>\n </div>\n ');85; if (data.editCode) { ; buf.push('\n <div id="codeTextbox" contenteditable spellcheck=false></div>\n ');87; } ; buf.push('\n</div>\n\n<div class="clear"></div>\n'); })();
10575+
var helpArea = function(html) {; buf.push(' ');32; if (html) {; buf.push(' <div id="helpArea">\n ', (33, html ), '\n </div>\n ');35; }; buf.push('');35; };; buf.push('\n<div id="visualizationColumn">\n <div id="visualization">\n ', (38, data.visualization ), '\n </div>\n\n <div id="belowVisualization">\n\n <div id="gameButtons">\n <button id="runButton" class="launch blocklyLaunch ', escape((44, hideRunButton ? 'invisible' : '')), '">\n <div>', escape((45, msg.runProgram() )), '</div>\n <img src="', escape((46, assetUrl('media/1x1.gif') )), '" class="run26"/>\n </button>\n <button id="resetButton" class="launch blocklyLaunch" style="display: none">\n <div>', escape((49, msg.resetProgram() )), '</div>\n <img src="', escape((50, assetUrl('media/1x1.gif') )), '" class="reset26"/>\n </button>\n ');52; if (data.controls) { ; buf.push('\n ', (53, data.controls ), '\n ');54; } ; buf.push('\n ');55; if (data.extraControlRows) { ; buf.push('\n ', (56, data.extraControlRows ), '\n ');57; } ; buf.push('\n </div>\n\n ');60; instructions() ; buf.push('\n ');61; helpArea(data.helpHtml) ; buf.push('\n\n </div>\n</div>\n\n');66; if (data.editCode) { ; buf.push('\n <div id="codeWorkspace">\n');68; } else { ; buf.push('\n <div id="blockly">\n');70; } ; buf.push('\n <div id="headers" dir="', escape((71, data.localeDirection )), '">\n <div id="toolbox-header" class="blockly-header"><span>', escape((72, msg.toolboxHeader() )), '</span></div>\n <div id="workspace-header" class="blockly-header">\n <span id="workspace-header-span">', escape((74, msg.workspaceHeader())), ' </span>\n <div id="blockCounter">\n <div id="blockUsed" class=', escape((76, data.blockCounterClass )), '>\n ', escape((77, data.blockUsed )), '\n </div>\n <span>&nbsp;/</span>\n <span id="idealBlockNumber">', escape((80, data.idealBlockNumber )), '</span>\n </div>\n </div>\n <div id="show-code-header" class="blockly-header"><span>', escape((83, msg.showCodeHeader() )), '</span></div>\n </div>\n ');85; if (data.editCode) { ; buf.push('\n <div id="codeTextbox"></div>\n ');87; } ; buf.push('\n</div>\n\n<div class="clear"></div>\n'); })();
1058810576
}
1058910577
return buf.join('');
1059010578
};
@@ -11261,10 +11249,6 @@ exports.savedToGallery = function(d){return "تم الحفط في المعرض!"
1126111249

1126211250
exports.shareFailure = function(d){return "عذراً، لا يمكن أن نشارك هذا البرنامج."};
1126311251

11264-
exports.typeFuncs = function(d){return "الدوال المتاحة: %1"};
11265-
11266-
exports.typeHint = function(d){return "تذكر أن الأقواس والفواصل المنقوطة ضرورية."};
11267-
1126811252
exports.workspaceHeader = function(d){return "أجمع القطع هنا: "};
1126911253

1127011254
exports.workspaceHeaderJavaScript = function(d){return "أكتب الكود البرمجي جافاسكريبت هنا"};

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

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

0 commit comments

Comments
 (0)