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

Upgrade math_number_minmax and other shadow upgrades (#1153)

Browse Source 
* Upgrade for set_pin

* patchBlocks overhaul

* Remove unneeded upgrade
This commit is contained in:
Guillaume Jenkins
2018-08-30 17:36:20 -04:00
committed by GitHub
parent 2482abf9f8
commit fef1f9a80d
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
editor/extension.ts
View File

@ -501,7 +501,9 @@ namespace pxt.editor {
// showleds // showleds
const nodes = U.toArray(dom.querySelectorAll("block[type=device_show_leds]")) const nodes = U.toArray(dom.querySelectorAll("block[type=device_show_leds]"))
.concat(U.toArray(dom.querySelectorAll("block[type=device_build_image]"))) .concat(U.toArray(dom.querySelectorAll("block[type=device_build_image]")))
.concat(U.toArray(dom.querySelectorAll("shadow[type=device_build_image]")))
.concat(U.toArray(dom.querySelectorAll("block[type=device_build_big_image]"))) .concat(U.toArray(dom.querySelectorAll("block[type=device_build_big_image]")))
.concat(U.toArray(dom.querySelectorAll("shadow[type=device_build_big_image]")));
nodes.forEach(node => { nodes.forEach(node => {
// don't rewrite if already upgraded, eg. field LEDS already present // don't rewrite if already upgraded, eg. field LEDS already present
if (U.toArray(node.children).filter(child => child.tagName == "field" && "LEDS" == child.getAttribute("name"))[0]) if (U.toArray(node.children).filter(child => child.tagName == "field" && "LEDS" == child.getAttribute("name"))[0])
@ -610,6 +612,7 @@ namespace pxt.editor {
// device_random now refers to randomRange() so we need to add the missing lower bound argument // device_random now refers to randomRange() so we need to add the missing lower bound argument
U.toArray(dom.querySelectorAll("block[type=device_random]")) U.toArray(dom.querySelectorAll("block[type=device_random]"))
.concat(U.toArray(dom.querySelectorAll("shadow[type=device_random]")))
.forEach(node => { .forEach(node => {
if (getValue(node, "min")) return; if (getValue(node, "min")) return;
const v = node.ownerDocument.createElement("value"); const v = node.ownerDocument.createElement("value");
@ -632,6 +635,7 @@ namespace pxt.editor {
</block> </block>
*/ */
U.toArray(dom.querySelectorAll("block[type=math_arithmetic]")) U.toArray(dom.querySelectorAll("block[type=math_arithmetic]"))
.concat(U.toArray(dom.querySelectorAll("shadow[type=math_arithmetic]")))
.forEach(node => { .forEach(node => {
const op = getField(node, "OP"); const op = getField(node, "OP");
if (!op || op.textContent.trim() !== "DIVIDE") return; if (!op || op.textContent.trim() !== "DIVIDE") return;
@ -663,8 +667,18 @@ namespace pxt.editor {
const b = getValue(node, "B"); const b = getValue(node, "B");
if (b) b.setAttribute("name", "ARG1"); if (b) b.setAttribute("name", "ARG1");
}) });
// math_number_minmax
U.toArray(dom.querySelectorAll("block[type=math_number_minmax]"))
.concat(U.toArray(dom.querySelectorAll("shadow[type=math_number_minmax]")))
.forEach(node => {
// Change the name of the NUM field to SLIDER
const numField = getField(node, "NUM");
if (numField) {
numField.setAttribute("name", "SLIDER");
}
});
} }
initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> { initExtensionsAsync = function (opts: pxt.editor.ExtensionOptions): Promise<pxt.editor.ExtensionResult> {