diff --git a/.eslintrc b/.eslintrc index e77de230f..0d67347a8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -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, diff --git a/src/engine/runtime.js b/src/engine/runtime.js index 01b7a9946..ac1652c7b 100644 --- a/src/engine/runtime.js +++ b/src/engine/runtime.js @@ -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); } } } diff --git a/src/engine/sequencer.js b/src/engine/sequencer.js index c48fa8d0a..b72129952 100644 --- a/src/engine/sequencer.js +++ b/src/engine/sequencer.js @@ -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); };