Skip to content

Commit 894d876

Browse files
ThomasPohlThomasPohl
authored
Merge pull request #151 from ThomasPohl/feature/ESLint-9
Migrate to ESLint 9 #148
2 parents 7c680e1 + 3f3307e commit 894d876

19 files changed

+3855
-1094
lines changed

‎.eslintignore

-2
This file was deleted.

‎.eslintrc.js

-61
This file was deleted.

‎admin/blockly.js

+33-28
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,59 @@
1-
"use strict";
1+
'use strict';
22

3-
if (typeof goog !== "undefined") {
4-
goog.provide("Blockly.JavaScript.Sendto");
3+
var goog = goog || undefined;
4+
var Blockly = Blockly || undefined;
5+
var main = main || undefined;
6+
var document = document || undefined;
57

6-
goog.require("Blockly.JavaScript");
8+
if (typeof goog !== 'undefined') {
9+
goog.provide('Blockly.JavaScript.Sendto');
10+
11+
goog.require('Blockly.JavaScript');
712
}
813

9-
Blockly.Words["google-spreadsheet_anyInstance"] = { en: "all instances", de: "allen Instanzen" };
14+
Blockly.Words['google-spreadsheet_anyInstance'] = { en: 'all instances', de: 'allen Instanzen' };
1015

11-
function getInstances(withAny=true){
16+
/* eslint-disable @typescript-eslint/no-unused-vars */
17+
function getInstances(withAny = true) {
1218
var options = [];
13-
if (withAny){
14-
options.push([Blockly.Translate("google-spreadsheet_anyInstance"), ""]);
19+
if (withAny) {
20+
options.push([Blockly.Translate('google-spreadsheet_anyInstance'), '']);
1521
}
16-
if (typeof main !== "undefined" && main.instances) {
22+
if (typeof main !== 'undefined' && main.instances) {
1723
for (var i = 0; i < main.instances.length; i++) {
1824
var m = main.instances[i].match(/^system.adapter.google-spreadsheet.(\d+)$/);
1925
if (m) {
2026
var n = parseInt(m[1], 10);
21-
options.push(["google-spreadsheet." + n, "." + n]);
27+
options.push([`google-spreadsheet.${n}`, `.${n}`]);
2228
}
2329
}
2430
}
2531

2632
if (!options.length) {
2733
for (var u = 0; u <= 4; u++) {
28-
options.push(["google-spreadsheet." + u, "." + u]);
34+
options.push([`google-spreadsheet.${u}`, `.${u}`]);
2935
}
3036
}
3137
return options;
3238
}
39+
/* eslint-enable @typescript-eslint/no-unused-vars */
3340

34-
function loadJS(filename){
35-
console.log("Loading " + filename)
41+
function loadJS(filename) {
42+
console.log(`Loading ${filename}`);
3643
const scriptTag = document.createElement('script');
37-
try {
38-
scriptTag.src = filename;
44+
try {
45+
scriptTag.src = filename;
3946

40-
document.body.appendChild(scriptTag);
41-
} catch (e) {
42-
console.error('Cannot load ' + filename + ': ' + e);
43-
}
47+
document.body.appendChild(scriptTag);
48+
} catch (e) {
49+
console.error(`Cannot load ${filename}: ${e}`);
50+
}
4451
}
4552

46-
loadJS("../google-spreadsheet/blocks/append.js");
47-
loadJS("../google-spreadsheet/blocks/deleteRows.js");
48-
loadJS("../google-spreadsheet/blocks/createSheet.js");
49-
loadJS("../google-spreadsheet/blocks/deleteSheet.js");
50-
loadJS("../google-spreadsheet/blocks/duplicateSheet.js");
51-
loadJS("../google-spreadsheet/blocks/readCell.js");
52-
loadJS("../google-spreadsheet/blocks/writeCell.js");
53-
54-
53+
loadJS('../google-spreadsheet/blocks/append.js');
54+
loadJS('../google-spreadsheet/blocks/deleteRows.js');
55+
loadJS('../google-spreadsheet/blocks/createSheet.js');
56+
loadJS('../google-spreadsheet/blocks/deleteSheet.js');
57+
loadJS('../google-spreadsheet/blocks/duplicateSheet.js');
58+
loadJS('../google-spreadsheet/blocks/readCell.js');
59+
loadJS('../google-spreadsheet/blocks/writeCell.js');

‎admin/blocks/append.js

+40-44
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
"use strict";
1+
'use strict';
2+
var Blockly = Blockly || undefined;
3+
var getInstances = getInstances || undefined;
24

35
/// --- Append --------------------------------------------------
6+
Blockly.Words['google-spreadsheet_append_add-to'] = { en: 'append to', de: 'füge zu' };
7+
Blockly.Words['google-spreadsheet_append_on-sheetName'] = { en: 'on sheet', de: 'auf Tabellenblatt' };
8+
Blockly.Words['google-spreadsheet_append_data'] = { en: 'the data', de: 'die Daten' };
9+
Blockly.Words['google-spreadsheet_append_add-to-suffix'] = { en: '', de: 'hinzu' };
410

5-
Blockly.Words["google-spreadsheet_append_add-to"] = { en: "append to", de: "füge zu" }
6-
Blockly.Words["google-spreadsheet_append_on-sheetName"] = { en: "on sheet", de: "auf Tabellenblatt" }
7-
Blockly.Words["google-spreadsheet_append_data"] = { en: "the data", de: "die Daten" }
8-
Blockly.Words["google-spreadsheet_append_add-to-suffix"] = { en: "", de: "hinzu" }
9-
10-
Blockly.Sendto.blocks["google-spreadsheet.append"] =
11+
Blockly.Sendto.blocks['google-spreadsheet.append'] =
1112
'<block type="google-spreadsheet.append">' +
1213
' <value name="NAME">' +
13-
' </value>' +
14+
' </value>' +
1415
' <value name="INSTANCE">' +
1516
' </value>' +
1617
' <value name="SHEET_NAME">' +
@@ -22,40 +23,35 @@ Blockly.Sendto.blocks["google-spreadsheet.append"] =
2223
' </value>' +
2324
'</block>';
2425

25-
Blockly.Blocks["google-spreadsheet.append"] = {
26-
init: function () {
27-
const instances = getInstances();
28-
29-
this.appendDummyInput("NAME")
30-
.appendField(Blockly.Translate("google-spreadsheet_append_add-to"))
31-
.appendField(new Blockly.FieldDropdown(instances), "INSTANCE");
32-
33-
this.appendValueInput("SHEET_NAME")
34-
.appendField(Blockly.Translate("google-spreadsheet_append_on-sheetName"));
35-
36-
this.appendValueInput("DATA")
37-
.appendField(Blockly.Translate("google-spreadsheet_append_data"));
38-
39-
this.appendDummyInput()
40-
.appendField(Blockly.Translate("google-spreadsheet_append_add-to-suffix"));
41-
42-
this.setInputsInline(false);
43-
this.setPreviousStatement(true, null);
44-
this.setNextStatement(true, null);
45-
46-
this.setColour(Blockly.Sendto.HUE);
47-
48-
},
49-
};
50-
51-
Blockly.JavaScript["google-spreadsheet.append"] = function (block) {
52-
var dropdown_instance = block.getFieldValue("INSTANCE");
53-
var data = Blockly.JavaScript.valueToCode(block, "DATA", Blockly.JavaScript.ORDER_ATOMIC);
54-
if (!data){
55-
data = "{}";
56-
}
57-
var sheetName = Blockly.JavaScript.valueToCode(block, "SHEET_NAME", Blockly.JavaScript.ORDER_ATOMIC);
58-
59-
return 'sendTo("google-spreadsheet' + dropdown_instance + '", "append", {"sheetName":'+sheetName+', "data":' + data + "});\n";
60-
};
26+
Blockly.Blocks['google-spreadsheet.append'] = {
27+
init: function () {
28+
const instances = getInstances();
29+
30+
this.appendDummyInput('NAME')
31+
.appendField(Blockly.Translate('google-spreadsheet_append_add-to'))
32+
.appendField(new Blockly.FieldDropdown(instances), 'INSTANCE');
33+
34+
this.appendValueInput('SHEET_NAME').appendField(Blockly.Translate('google-spreadsheet_append_on-sheetName'));
35+
36+
this.appendValueInput('DATA').appendField(Blockly.Translate('google-spreadsheet_append_data'));
37+
38+
this.appendDummyInput().appendField(Blockly.Translate('google-spreadsheet_append_add-to-suffix'));
39+
40+
this.setInputsInline(false);
41+
this.setPreviousStatement(true, null);
42+
this.setNextStatement(true, null);
43+
44+
this.setColour(Blockly.Sendto.HUE);
45+
},
46+
};
47+
48+
Blockly.JavaScript['google-spreadsheet.append'] = function (block) {
49+
var dropdown_instance = block.getFieldValue('INSTANCE');
50+
var data = Blockly.JavaScript.valueToCode(block, 'DATA', Blockly.JavaScript.ORDER_ATOMIC);
51+
if (!data) {
52+
data = '{}';
53+
}
54+
var sheetName = Blockly.JavaScript.valueToCode(block, 'SHEET_NAME', Blockly.JavaScript.ORDER_ATOMIC);
6155

56+
return `sendTo("google-spreadsheet${dropdown_instance}", "append", {"sheetName":${sheetName}, "data":${data}});\n`;
57+
};

‎admin/blocks/createSheet.js

+36-28
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,52 @@
1+
'use strict';
2+
var Blockly = Blockly || undefined;
3+
var getInstances = getInstances || undefined;
4+
15
/// ---Create sheet --------------------------------------------------
2-
Blockly.Words["google-spreadsheet_create-sheet_create-in"] = { en: "create in", de: "erstelle in" }
3-
Blockly.Words["google-spreadsheet_create-sheet_sheet-name"] = { en: "a sheet with name", de: "ein Blatt mit dem Namen" }
4-
5-
Blockly.Sendto.blocks["google-spreadsheet.createSheet"] =
6-
'<block type="google-spreadsheet.createSheet">' +
7-
' <value name="NAME">' +
8-
' </value>' +
9-
' <value name="INSTANCE">' +
10-
' </value>' +
11-
' <value name="SHEET_NAME">' +
12-
' <shadow type="text">' +
13-
' <field name="TEXT">text</field>' +
14-
' </shadow>' +
15-
' </value>' +
16-
"</block>";
17-
18-
Blockly.Blocks["google-spreadsheet.createSheet"] = {
6+
Blockly.Words['google-spreadsheet_create-sheet_create-in'] = { en: 'create in', de: 'erstelle in' };
7+
Blockly.Words['google-spreadsheet_create-sheet_sheet-name'] = {
8+
en: 'a sheet with name',
9+
de: 'ein Blatt mit dem Namen',
10+
};
11+
12+
Blockly.Sendto.blocks['google-spreadsheet.createSheet'] =
13+
'<block type="google-spreadsheet.createSheet">' +
14+
' <value name="NAME">' +
15+
' </value>' +
16+
' <value name="INSTANCE">' +
17+
' </value>' +
18+
' <value name="SHEET_NAME">' +
19+
' <shadow type="text">' +
20+
' <field name="TEXT">text</field>' +
21+
' </shadow>' +
22+
' </value>' +
23+
'</block>';
24+
25+
Blockly.Blocks['google-spreadsheet.createSheet'] = {
1926
init: function () {
2027
const instances = getInstances();
2128

22-
this.appendDummyInput("INSTANCE")
23-
.appendField(Blockly.Translate("google-spreadsheet_create-sheet_create-in"))
24-
.appendField(new Blockly.FieldDropdown(instances), "INSTANCE");
29+
this.appendDummyInput('INSTANCE')
30+
.appendField(Blockly.Translate('google-spreadsheet_create-sheet_create-in'))
31+
.appendField(new Blockly.FieldDropdown(instances), 'INSTANCE');
2532

26-
this.appendValueInput("SHEET_NAME")
27-
.appendField(Blockly.Translate("google-spreadsheet_create-sheet_sheet-name"));
33+
this.appendValueInput('SHEET_NAME').appendField(
34+
Blockly.Translate('google-spreadsheet_create-sheet_sheet-name'),
35+
);
2836

2937
this.setInputsInline(false);
3038
this.setPreviousStatement(true, null);
3139
this.setNextStatement(true, null);
3240

3341
this.setColour(Blockly.Sendto.HUE);
34-
this.setTooltip(Blockly.Translate("google-spreadsheet_tooltip"));
35-
this.setHelpUrl(Blockly.Translate("google-spreadsheet_help"));
42+
this.setTooltip(Blockly.Translate('google-spreadsheet_tooltip'));
43+
this.setHelpUrl(Blockly.Translate('google-spreadsheet_help'));
3644
},
3745
};
3846

39-
Blockly.JavaScript["google-spreadsheet.createSheet"] = function (block) {
40-
var dropdown_instance = block.getFieldValue("INSTANCE");
41-
var data = Blockly.JavaScript.valueToCode(block, "SHEET_NAME", Blockly.JavaScript.ORDER_ATOMIC);
47+
Blockly.JavaScript['google-spreadsheet.createSheet'] = function (block) {
48+
var dropdown_instance = block.getFieldValue('INSTANCE');
49+
var data = Blockly.JavaScript.valueToCode(block, 'SHEET_NAME', Blockly.JavaScript.ORDER_ATOMIC);
4250

43-
return 'sendTo("google-spreadsheet' + dropdown_instance + '", "createSheet", ' + data + ");\n";
51+
return `sendTo("google-spreadsheet${dropdown_instance}", "createSheet", ${data});\n`;
4452
};

0 commit comments

Comments
 (0)