mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2024-12-23 14:32:59 -05:00
Adding support for dynamic menus in extensions.
This commit is contained in:
parent
229cd7a50c
commit
b6bb92d8f6
2 changed files with 42 additions and 15 deletions
|
@ -551,12 +551,13 @@ class Runtime extends EventEmitter {
|
|||
*/
|
||||
_buildMenuForScratchBlocks (menuName, menuItems, categoryInfo) {
|
||||
const menuId = this._makeExtensionMenuId(menuName, categoryInfo.id);
|
||||
|
||||
/** @TODO: support dynamic menus when 'menuItems' is a method name string (see extension spec) */
|
||||
if (typeof menuItems === 'string') {
|
||||
throw new Error(`Dynamic extension menus are not yet supported. Menu name: ${menuName}`);
|
||||
var options = null;
|
||||
if (typeof menuItems === 'function') {
|
||||
options = function () {
|
||||
return menuItems();
|
||||
}
|
||||
const options = menuItems.map(item => {
|
||||
} else {
|
||||
options = menuItems.map(item => {
|
||||
switch (typeof item) {
|
||||
case 'string':
|
||||
return [item, item];
|
||||
|
@ -566,7 +567,7 @@ class Runtime extends EventEmitter {
|
|||
throw new Error(`Can't interpret menu item: ${item}`);
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
return {
|
||||
json: {
|
||||
message0: '%1',
|
||||
|
|
|
@ -242,9 +242,35 @@ class ExtensionManager {
|
|||
}
|
||||
return result;
|
||||
}, []);
|
||||
extensionInfo.menus = extensionInfo.menus || [];
|
||||
extensionInfo.menus = this._prepareMenuInfo(serviceName, extensionInfo.menus);
|
||||
return extensionInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepare extension menus. e.g. setup binding for dynamic menu functions.
|
||||
* @param {string} serviceName - the name of the service hosting this extension block
|
||||
* @param {Array.<MenuInfo>} menuInfo - the menu defined by the extension.
|
||||
* @returns {Array.<MenuInfo>} - a menuInfo object with all preprocessing done.
|
||||
* @private
|
||||
*/
|
||||
_prepareMenuInfo (serviceName, menus) {
|
||||
var menuNames = Object.getOwnPropertyNames(menus);
|
||||
for (let i = 0; i < menuNames.length; i++) {
|
||||
var item = menuNames[i];
|
||||
// If the value is a string, it should be the name of a function in the
|
||||
// extension object to call to populate the menu whenever it is opened.
|
||||
// Set up the binding for the function object here so
|
||||
// we can use it later when converting the menu for Scratch Blocks.
|
||||
if (typeof menus[item] === 'string') {
|
||||
const serviceObject = dispatch.services[serviceName];
|
||||
const menuFunc = serviceObject[menus[item]].bind(serviceObject);
|
||||
menus[item] = menuFunc;
|
||||
}
|
||||
}
|
||||
return menus;
|
||||
}
|
||||
|
||||
/**
|
||||
* Apply defaults for optional block fields.
|
||||
* @param {string} serviceName - the name of the service hosting this extension block
|
||||
|
|
Loading…
Reference in a new issue