Skip to content

Commit

Permalink
Merge pull request #204 from STEM-C/revert-203-develop
Browse files Browse the repository at this point in the history
Revert "Updating Staging"
  • Loading branch information
syuChen1 authored May 23, 2021
2 parents 4617d14 + 08bbcb2 commit 7f12f61
Show file tree
Hide file tree
Showing 16 changed files with 9,073 additions and 9,483 deletions.
1 change: 0 additions & 1 deletion client/.gitignore

This file was deleted.

3 changes: 1 addition & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"react-dom": "^16.13.1",
"react-papaparse": "^3.7.0",
"react-router-dom": "^5.1.2",
"react-scripts": "3.4.1",
"yarn": "^1.22.10"
"react-scripts": "3.4.1"
},
"scripts": {
"start": "craco start",
Expand Down
29 changes: 0 additions & 29 deletions client/public/lib/arduino_compressed.js
Original file line number Diff line number Diff line change
Expand Up @@ -1204,33 +1204,4 @@ Blockly.Arduino.variables_set = function(a) {
Blockly.Arduino.variables_set_type = function(a) {
var b = Blockly.Arduino.valueToCode(a, "VARIABLE_SETTYPE_INPUT", Blockly.Arduino.ORDER_ASSIGNMENT) || "0";
return ["(" + Blockly.Arduino.getArduinoType_(Blockly.Types[a.getFieldValue("VARIABLE_SETTYPE_TYPE")]) + ")(" + b + ")", Blockly.Arduino.ORDER_ATOMIC]
};

//inline comment
Blockly.Arduino.insert_comment = function(a) {
var b;
var x;
if (0 == a.itemCount_) return "// \n";
if (1 == a.itemCount_) {
x = (Blockly.Arduino.valueToCode(a, "ADD0", Blockly.Arduino.ORDER_UNARY_POSTFIX) || '');
x = x.slice(0,-1);
x = x.substring(1);
return "// " + x + "\n";
}
var c;
b = [];
for (var d = 0; d < a.itemCount_; d++){
c = Blockly.Arduino.valueToCode(a, "ADD" + d, Blockly.Arduino.ORDER_NONE);
c = c.slice(0,-1);
c = c.substring(1);
b[d] = "" == c ? '' : "// " + c + "\n";
}
b = b.join("");
return b;
};

//block comment
Blockly.Arduino.block_comment = function(a) {
var b = Blockly.Arduino.statementToCode(a, 'comment');
return "/* " + a.getFieldValue("comment_input") + "\n" + b + "*/\n";
};
129 changes: 1 addition & 128 deletions client/public/lib/blocks_compressed.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions client/public/lib/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -510,12 +510,3 @@ Blockly.Msg.NEW_INSTANCE = "New instance...";
Blockly.Msg.NEW_INSTANCE_TITLE = "New instance name:";
Blockly.Msg.RENAME_INSTANCE = "Rename instance...";
Blockly.Msg.RENAME_INSTANCE_TITLE = "Rename all '%1' instances to:";
Blockly.Msg.COMMENT_TIP = "Put comment in the same line";
Blockly.Msg.BLOCK_COMMENT_TIP = "Put multiple line comment";
Blockly.Msg.COMMENT_HELPURL = "https://www.arduino.cc/reference/en/language/structure/further-syntax/singlelinecomment/";
Blockly.Msg.COMMENT_JOIN_ITEM_TOOLTIP = "Add one line of comment.";
Blockly.Msg.COMMENT_CREATE_JOIN_TOOLTIP = "Add, remove, or reorder sections to reconfigure this comment block.";
Blockly.Msg.COMMENT_CREATEWITH = "comments";



Loading

0 comments on commit 7f12f61

Please sign in to comment.