c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing imports of legacy scripts

Browse Source
This commit is contained in:
Peli de Halleux
2018-06-12 06:05:18 -07:00
parent 785e180c53
commit e556c1afca
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
editor/extension.ts
View File

@@ -435,19 +435,22 @@ namespace pxt.editor {
.concat(U.toArray(dom.querySelectorAll("block[type=device_build_big_image]"))) .concat(U.toArray(dom.querySelectorAll("block[type=device_build_big_image]")))
nodes.forEach(node => { nodes.forEach(node => {
const leds: string[][] = [[], [], [], [], []]; const leds: string[][] = [[], [], [], [], []];
U.toArray(node.querySelectorAll("field[name^=LED]")) U.toArray(node.children)
.filter(child => child.tagName == "field" && /^LED\d+$/.test(child.getAttribute("name")))
.forEach(lednode => { .forEach(lednode => {
let n = lednode.getAttribute("name"); let n = lednode.getAttribute("name");
let col = parseInt(n[3]); let col = parseInt(n[3]);
let row = parseInt(n[4]); let row = parseInt(n[4]);
leds[row][col] = lednode.innerHTML == "TRUE" ? "#" : "."; leds[row][col] = lednode.innerHTML == "TRUE" ? "#" : ".";
// remove node
node.removeChild(lednode);
}); });
node.innerHTML = ""; // add new field
const f = node.ownerDocument.createElement("field"); const f = node.ownerDocument.createElement("field");
f.setAttribute("name", "LEDS"); f.setAttribute("name", "LEDS");
const s = '`\n' + leds.map(row => row.join('')).join('\n') + '\n`'; const s = '`\n' + leds.map(row => row.join('')).join('\n') + '\n`';
f.appendChild(node.ownerDocument.createTextNode(s)); f.appendChild(node.ownerDocument.createTextNode(s));
node.appendChild(f); node.insertBefore(f, null);
}); });
// radio // radio
@@ -522,11 +525,11 @@ namespace pxt.editor {
pxt.debug('loading microbit target extensions...') pxt.debug('loading microbit target extensions...')
if (!Math.imul) if (!Math.imul)
Math.imul = (a, b) => { Math.imul = function(a, b) {
var ah = (a >>> 16) & 0xffff; const ah = (a >>> 16) & 0xffff;
var al = a & 0xffff; const al = a & 0xffff;
var bh = (b >>> 16) & 0xffff; const bh = (b >>> 16) & 0xffff;
var bl = b & 0xffff; const bl = b & 0xffff;
// the shift by 0 fixes the sign on the high part // the shift by 0 fixes the sign on the high part
// the final |0 converts the unsigned value into a signed value // the final |0 converts the unsigned value into a signed value
return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0) | 0); return ((al * bl) + (((ah * bl + al * bh) << 16) >>> 0) | 0);