optimize gen code of firebase block

Author: oxxostudio

blocks/msg/en.js

@@ -309,16 +309,24 @@ Blockly.Msg.WEBDUINO_BUZZER_SINGLE_PITCH = "pitch";
 Blockly.Msg.WEBDUINO_BUZZER_SINGLE_TEMPOS = "tempo";
 
 Blockly.Msg.WEBDUINO_FIREBASE_NAME = "< Firebase > name:";
+Blockly.Msg.WEBDUINO_FIREBASE_ADDCOLUMN = 'Add Column';
+Blockly.Msg.WEBDUINO_FIREBASE_COLUMN = 'column';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATA = "Add data";
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATACOLUMN = 'column ';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATANAME = ' name:';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATAVAL = ' value:';
 Blockly.Msg.WEBDUINO_FIREBASE_URL = ",url:";
 Blockly.Msg.WEBDUINO_FIREBASE_DO = "do:";
 Blockly.Msg.WEBDUINO_FIREBASE_WRITE = "Write";
-Blockly.Msg.WEBDUINO_FIREBASE_IS = "is";
+Blockly.Msg.WEBDUINO_FIREBASE_S = "is";
 Blockly.Msg.WEBDUINO_FIREBASE_READ = "If";
 Blockly.Msg.WEBDUINO_FIREBASE_ATTR = "changed, read property";
 Blockly.Msg.WEBDUINO_FIREBASE_TO = "to";
 Blockly.Msg.WEBDUINO_FIREBASE_CLEAR = "Clear Database";
 Blockly.Msg.WEBDUINO_FIREBASE_READONCE = "Read";
 Blockly.Msg.WEBDUINO_FIREBASE_ATTRONCE = "'s property";
+Blockly.Msg.WEBDUINO_FIREBASE_DATAALL = "All";
+Blockly.Msg.WEBDUINO_FIREBASE_DATALAST = "Last one";
 
 // LED
 

blocks/msg/zh-hant.js

@@ -401,7 +401,13 @@ Blockly.Msg.WEBDUINO_FISH_RIGHT = "(右轉)";
 
 // Firebase
 
-Blockly.Msg.WEBDUINO_FIREBASE_NAME = "< Firebase > 名稱";
+Blockly.Msg.WEBDUINO_FIREBASE_NAME = "載入 Firebase 資料庫";
+Blockly.Msg.WEBDUINO_FIREBASE_ADDCOLUMN = '增加資料欄位';
+Blockly.Msg.WEBDUINO_FIREBASE_COLUMN = '欄位';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATA = "寫入資料";
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATACOLUMN = '欄位 ';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATANAME = ' 名稱:';
+Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATAVAL = ' 值:';
 Blockly.Msg.WEBDUINO_FIREBASE_URL = "網址";
 Blockly.Msg.WEBDUINO_FIREBASE_DO = "執行";
 Blockly.Msg.WEBDUINO_FIREBASE_WRITE = "寫入";
@@ -413,6 +419,8 @@ Blockly.Msg.WEBDUINO_FIREBASE_TO = "到";
 Blockly.Msg.WEBDUINO_FIREBASE_CLEAR = "清空資料庫";
 Blockly.Msg.WEBDUINO_FIREBASE_READONCE = "載入資料庫";
 Blockly.Msg.WEBDUINO_FIREBASE_ATTRONCE = "屬性";
+Blockly.Msg.WEBDUINO_FIREBASE_DATAALL = "完整內容";
+Blockly.Msg.WEBDUINO_FIREBASE_DATALAST = "最後一筆更新";
 
 // RFID
 

blocks/webduino.js

@@ -1891,12 +1891,10 @@ Blockly.Blocks['servo_angle_set'] = {
 Blockly.Blocks['data_firebase'] = {
  init: function () {
  this.appendValueInput("name_")
- .appendField(Blockly.Msg.WEBDUINO_FIREBASE_NAME, "< Firebase > 名稱：");
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_NAME, "使用 firebase 資料庫");
  this.appendDummyInput()
  .appendField(Blockly.Msg.WEBDUINO_FIREBASE_URL, "網址：")
  .appendField(new Blockly.FieldTextInput("https://<YOUR-FIREBASE-APP>.firebaseio.com"), "url_");
- this.appendStatementInput("do_")
- .appendField(Blockly.Msg.WEBDUINO_FIREBASE_DO, "執行：");
  this.setPreviousStatement(true);
  this.setNextStatement(true);
  this.setTooltip('');
@@ -1905,17 +1903,115 @@ Blockly.Blocks['data_firebase'] = {
  }
 };
 
-Blockly.Blocks['data_firebase_write'] = {
+Blockly.Blocks['data_firebase_write_container'] = {
  init: function () {
- this.appendStatementInput("write_")
- .appendField(new Blockly.FieldVariable("myFirebase"), "var_")
- .appendField(Blockly.Msg.WEBDUINO_FIREBASE_WRITE, "寫入");
+ this.setColour(100);
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_ADDCOLUMN, '增加資料欄位');
+ this.appendStatementInput('STACK');
+ this.setTooltip('');
+ this.contextMenu = false;
+ }
+};
+
+Blockly.Blocks['data_firebase_write_item'] = {
+ init: function () {
+ this.setColour(100);
+ this.appendDummyInput()
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_COLUMN,'欄位');
  this.setPreviousStatement(true);
  this.setNextStatement(true);
  this.setTooltip('');
+ this.contextMenu = false;
+ }
+};
+
+Blockly.Blocks['data_firebase_write'] = {
+ init: function () {
+ this.appendDummyInput()
+ .appendField(new Blockly.FieldVariable("myFirebase"), "var_")
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATA,"寫入資料");
  this.setColour(160);
+ this.itemCount_ = 2;
+ this.updateShape_();
+ this.setMutator(new Blockly.Mutator(['data_firebase_write_item']));
+ this.setTooltip('');
+ this.setPreviousStatement(true);
+ this.setNextStatement(true);
  this.setHelpUrl('http://www.example.com/');
- }
+ },
+ mutationToDom: function () {
+ var container = document.createElement('mutation');
+ container.setAttribute('items', this.itemCount_);
+ return container;
+ },
+ domToMutation: function (xmlElement) {
+ this.itemCount_ = parseInt(xmlElement.getAttribute('items'), 10);
+ this.updateShape_();
+ },
+ decompose: function (workspace) {
+ var containerBlock = Blockly.Block.obtain(workspace,
+ 'data_firebase_write_container');
+ containerBlock.initSvg();
+ var connection = containerBlock.getInput('STACK').connection;
+ for (var i = 0; i < this.itemCount_; i++) {
+ var itemBlock = Blockly.Block.obtain(workspace, 'data_firebase_write_item');
+ itemBlock.initSvg();
+ connection.connect(itemBlock.previousConnection);
+ connection = itemBlock.nextConnection;
+ }
+ return containerBlock;
+ },
+ compose: function (containerBlock) {
+ var itemBlock = containerBlock.getInputTargetBlock('STACK');
+ var connections = [];
+ while (itemBlock) {
+ connections.push(itemBlock.valueConnection_);
+ itemBlock = itemBlock.nextConnection &&
+ itemBlock.nextConnection.targetBlock();
+ }
+ this.itemCount_ = connections.length;
+ this.updateShape_();
+ for (var i = 0; i < this.itemCount_; i++) {
+ if (connections[i]) {
+ this.getInput('data_' + i).connection.connect(connections[i]);
+ }
+ }
+ },
+ saveConnections: function (containerBlock) {
+ var itemBlock = containerBlock.getInputTargetBlock('STACK');
+ var i = 0;
+ while (itemBlock) {
+ var input = this.getInput('data_' + i);
+ itemBlock.valueConnection_ = input && input.connection.targetConnection;
+ i++;
+ itemBlock = itemBlock.nextConnection &&
+ itemBlock.nextConnection.targetBlock();
+ }
+ },
+ updateShape_: function () {
+ var v = [];
+ if (this.getInput('EMPTY')) {
+ this.removeInput('EMPTY');
+ } else {
+ var i = 0;
+ while (this.getInput('data_' + i)) {
+ v[i] = this.getInput('data_' + i).fieldRow[1].text_;
+ this.removeInput('data_' + i);
+ i++;
+ }
+ }
+ if (this.itemCount_ == 0) {} else {
+ for (var i = 0; i < this.itemCount_; i++) {
+ this.appendValueInput('data_' + i)
+ .setAlign(Blockly.ALIGN_RIGHT)
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATACOLUMN + (i + 1) + Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATANAME)
+ .appendField(new Blockly.FieldTextInput('...'), "name_" + i)
+ .appendField(Blockly.Msg.WEBDUINO_FIREBASE_WRITEDATAVAL);
+ }
+ }
+ },
+ newQuote_: Blockly.Blocks['text'].newQuote_
 };
 
 Blockly.Blocks['data_firebase_data'] = {
@@ -1940,8 +2036,8 @@ Blockly.Blocks['data_firebase_read'] = {
  .appendField(new Blockly.FieldTextInput("..."), "attr_")
  .appendField(Blockly.Msg.WEBDUINO_FIREBASE_S, "的")
  .appendField(new Blockly.FieldDropdown([
- ["完整內容", '1'],
- ["最後一筆更新", '2']
+ [Blockly.Msg.WEBDUINO_FIREBASE_DATAALL, '1'],
+ [Blockly.Msg.WEBDUINO_FIREBASE_DATALAST, '2']
  ]), "type_")
  .appendField(Blockly.Msg.WEBDUINO_FIREBASE_TO, "到");
  this.appendStatementInput("do_")

generators/webduino.js

@@ -1145,10 +1145,18 @@ Blockly.JavaScript['data_firebase'] = function (block) {
 Blockly.JavaScript['data_firebase_write'] = function (block) {
  var variable_var_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('var_'), Blockly.Variables.NAME_TYPE);
  var statements_write_ = Blockly.JavaScript.statementToCode(block, 'write_');
- var code = variable_var_ + '.push({\n' +
- ' ' + statements_write_ + '\n' +
- '});\n' +
- 'console.log("write ok");\n';
+ var c = '';
+ for (var n = 0; n < block.itemCount_; n++) {
+ var name = block.getFieldValue('name_' + n) || 'unknow';
+ var val = Blockly.JavaScript.valueToCode(block, 'data_' + n) || '""';
+ if(n<(block.itemCount_-1)){
+ c = c + ' ' + name +':'+val +',\n';
+ }else{
+ c = c + ' ' + name +':'+val +'\n';
+ }
+ }
+ var code = variable_var_ + '.push({\n'+c+
+ '});\n';
  return code;
 };
 

views/index.handlebars

@@ -907,21 +907,13 @@
  </value>
  </block>
  <block type="data_firebase_write"></block>
- <block type="data_firebase_data"></block>
  <block type="data_firebase_read">
  <value name="read_">
  <block type="variables_get">
  <field name="VAR">val</field>
  </block>
  </value>
  </block>
- <block type="data_firebase_readonce">
- <value name="read_">
- <block type="variables_get">
- <field name="VAR">val</field>
- </block>
- </value>
- </block>
  <block type="data_firebase_clear"></block>
  </category>
  <sep></sep>