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

Merge branch 'develop' into feature/extension-category-icons

Browse source
This commit is contained in:
Eric Rosenbaum 2017-12-19 15:39:00 -05:00 committed by GitHub
commit 2d6e91fa59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -60,7 +60,7 @@
"stats.js": "^0.17.0", "stats.js": "^0.17.0",
"tap": "^10.2.0", "tap": "^10.2.0",
"tiny-worker": "^2.1.1", "tiny-worker": "^2.1.1",
"webpack": "^2.4.1", "webpack": "^3.10.0",
"webpack-dev-server": "^2.4.1", "webpack-dev-server": "^2.4.1",
"worker-loader": "1.1.0" "worker-loader": "1.1.0"
} }

8
src/engine/runtime.js
View file

@ -618,16 +618,20 @@ class Runtime extends EventEmitter {
blockJSON.message0 = ''; blockJSON.message0 = '';
// If an icon for the extension exists, prepend it to each block // If an icon for the extension exists, prepend it to each block, with a vertical separator.
if (categoryInfo.blockIconURI) { if (categoryInfo.blockIconURI) {
blockJSON.message0 = '%1'; blockJSON.message0 = '%1 %2';
const iconJSON = { const iconJSON = {
type: 'field_image', type: 'field_image',
src: categoryInfo.blockIconURI, src: categoryInfo.blockIconURI,
width: 40, width: 40,
height: 40 height: 40
}; };
const separatorJSON = {
type: 'field_vertical_separator'
};
blockJSON.args0.push(iconJSON); blockJSON.args0.push(iconJSON);
blockJSON.args0.push(separatorJSON);
} }
blockJSON.message0 += blockInfo.text.replace(/\[(.+?)]/g, (match, placeholder) => { blockJSON.message0 += blockInfo.text.replace(/\[(.+?)]/g, (match, placeholder) => {