scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-05-16 00:12:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Fix eslint errors

Browse source 
This includes adding a line to `.eslintrc` to allow `console.log`,
`console.warn`, and `console.error`.
This commit is contained in:
Christopher Willis-Ford 2016-05-02 11:54:32 -07:00
parent 4a3276d026
commit 751ca97733
3 changed files with 18 additions and 15 deletions

3
.eslintrc
View file

@ -7,7 +7,8 @@
"linebreak-style": [2, "unix"],
"max-len": [2, 80, 4],
"semi": [2, "always"],
"strict": [2, "never"]
"strict": [2, "never"],
"no-console": [2, {"allow": ["log", "warn", "error"]}]
},
"env": {
"node": true,

5
src/engine/runtime.js
View file

@ -205,12 +205,13 @@ Runtime.prototype.deleteBlock = function (e) {
Runtime.prototype._registerBlockPackages = function () {
for (var packageName in defaultBlockPackages) {
if (defaultBlockPackages.hasOwnProperty(packageName)) {
// @todo maybe we pass a different runtime depending on package privilege level?
// @todo pass a different runtime depending on package privilege?
var packageObject = new (defaultBlockPackages[packageName])(this);
var packageContents = packageObject.getPrimitives();
for (var op in packageContents) {
if (packageContents.hasOwnProperty(op)) {
this._primitives[op] = packageContents[op].bind(packageObject);
this._primitives[op] =
packageContents[op].bind(packageObject);
}
}
}

25
src/engine/sequencer.js
View file

@ -60,23 +60,24 @@ Sequencer.prototype.stepThreads = function (threads) {
Sequencer.prototype.stepThread = function (thread) {
var opcode = this.runtime._getOpcode(thread.nextBlock);
if (!opcode) {
console.warn('Could not get opcode for block: ' + thread.nextBlock);
if (!opcode) {
console.warn('Could not get opcode for block: ' + thread.nextBlock);
}
else {
var blockFunction = this.runtime.getOpcodeFunction(opcode);
if (!blockFunction) {
console.warn('Could not get implementation for opcode: ' + opcode);
}
else {
var blockFunction = this.runtime.getOpcodeFunction(opcode);
if (!blockFunction) {
console.warn('Could not get implementation for opcode: ' + opcode);
try {
blockFunction();
}
else {
try {
blockFunction();
}
catch(e) {
console.error('Exception calling block function', {opcode: opcode, exception: e});
}
catch(e) {
console.error('Exception calling block function',
{opcode: opcode, exception: e});
}
}
}
thread.nextBlock = this.runtime._getNextBlock(thread.nextBlock);
};