scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 23:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Show extension status button via XML attr not button (#1270)

Browse source
This commit is contained in:
Eric Rosenbaum 2018-06-27 15:53:18 -04:00 committed by GitHub
parent 326c41875e
commit aa400ea15b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/engine/runtime.js
View file

@ -497,6 +497,7 @@ class Runtime extends EventEmitter {
const categoryInfo = { const categoryInfo = {
id: extensionInfo.id, id: extensionInfo.id,
name: maybeFormatMessage(extensionInfo.name), name: maybeFormatMessage(extensionInfo.name),
showStatusButton: extensionInfo.showStatusButton,
blockIconURI: extensionInfo.blockIconURI, blockIconURI: extensionInfo.blockIconURI,
menuIconURI: extensionInfo.menuIconURI, menuIconURI: extensionInfo.menuIconURI,
color1: extensionInfo.colour || '#FF6680', color1: extensionInfo.colour || '#FF6680',
@ -547,15 +548,6 @@ class Runtime extends EventEmitter {
} }
} }
// Add extension status button
if (extensionInfo.showStatusButton) {
categoryInfo.blocks.push({
info: {},
json: null,
xml: `<button type="status" extensionId="${categoryInfo.id}"></button>`
});
}
for (const blockInfo of extensionInfo.blocks) { for (const blockInfo of extensionInfo.blocks) {
if (blockInfo === '---') { if (blockInfo === '---') {
categoryInfo.blocks.push(ConvertedSeparator); categoryInfo.blocks.push(ConvertedSeparator);
@ -854,7 +846,13 @@ class Runtime extends EventEmitter {
const menuIconXML = menuIconURI ? const menuIconXML = menuIconURI ?
`iconURI="${menuIconURI}"` : ''; `iconURI="${menuIconURI}"` : '';
xmlParts.push(`<category name="${name}" id="${categoryInfo.id}" ${colorXML} ${menuIconXML}>`); let statusButtonXML = '';
if (categoryInfo.showStatusButton) {
statusButtonXML = 'showStatusButton="true"';
}
xmlParts.push(`<category name="${name}" id="${categoryInfo.id}"
${statusButtonXML} ${colorXML} ${menuIconXML}>`);
xmlParts.push.apply(xmlParts, paletteBlocks.map(block => block.xml)); xmlParts.push.apply(xmlParts, paletteBlocks.map(block => block.xml));
xmlParts.push('</category>'); xmlParts.push('</category>');
} }