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

Merge remote-tracking branch 'refs/remotes/LLK/develop' into feature/fencing

Browse source
This commit is contained in:
griffpatch 2017-02-09 08:54:28 +00:00
commit d740698e25
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -42,7 +42,7 @@
"scratch-render": "latest", "scratch-render": "latest",
"script-loader": "0.7.0", "script-loader": "0.7.0",
"stats.js": "0.17.0", "stats.js": "0.17.0",
"tap": "10.0.2", "tap": "10.1.0",
"travis-after-all": "1.4.4", "travis-after-all": "1.4.4",
"webpack": "2.2.1", "webpack": "2.2.1",
"webpack-dev-server": "1.16.3" "webpack-dev-server": "1.16.3"

7
src/engine/runtime.js
View file

@ -439,6 +439,11 @@ Runtime.prototype.startHats = function (requestedHatOpcode,
} }
var instance = this; var instance = this;
var newThreads = []; var newThreads = [];
for (var opts in optMatchFields) {
optMatchFields[opts] = optMatchFields[opts].toUpperCase();
}
// Consider all scripts, looking for hats with opcode `requestedHatOpcode`. // Consider all scripts, looking for hats with opcode `requestedHatOpcode`.
this.allScriptsDo(function (topBlockId, target) { this.allScriptsDo(function (topBlockId, target) {
var potentialHatOpcode = target.blocks.getBlock(topBlockId).opcode; var potentialHatOpcode = target.blocks.getBlock(topBlockId).opcode;
@ -466,7 +471,7 @@ Runtime.prototype.startHats = function (requestedHatOpcode,
if (optMatchFields) { if (optMatchFields) {
for (var matchField in optMatchFields) { for (var matchField in optMatchFields) {
if (hatFields[matchField].value !== if (hatFields[matchField].value.toUpperCase() !==
optMatchFields[matchField]) { optMatchFields[matchField]) {
// Field mismatch. // Field mismatch.
return; return;