From 49967c139a73b941adb2842dbba7c10d6558de72 Mon Sep 17 00:00:00 2001 From: nightwing Date: Tue, 9 Jul 2013 18:22:18 +0400 Subject: [PATCH] fix typo in noworker detection --- demo/kitchen-sink/demo.js | 2 +- lib/ace/mode/javascript/jshint.js | 4 ++-- lib/ace/mode/javascript_worker_test.js | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js index 88d5fa0e..193da9bb 100644 --- a/demo/kitchen-sink/demo.js +++ b/demo/kitchen-sink/demo.js @@ -71,7 +71,7 @@ var IncrementalSearch = require("ace/incremental_search").IncrementalSearch; var workerModule = require("ace/worker/worker_client"); -if (location.href.indexOf("noworker" !== -1)) { +if (location.href.indexOf("noworker") !== -1) { workerModule.WorkerClient = workerModule.UIWorkerClient; } diff --git a/lib/ace/mode/javascript/jshint.js b/lib/ace/mode/javascript/jshint.js index e486084a..8de6386e 100644 --- a/lib/ace/mode/javascript/jshint.js +++ b/lib/ace/mode/javascript/jshint.js @@ -5308,7 +5308,7 @@ var JSHINT = (function () { nobreaknonadjacent(state.tokens.prev, state.tokens.curr); nonadjacent(state.tokens.curr, state.tokens.next); } - if (s === "in" && left.id === "!") { + if (s === "in" && left && left.id === "!") { warning("W018", left, "!"); } if (typeof f === "function") { @@ -7892,4 +7892,4 @@ req("/src/stable/jshint.js"); function req() {return require.apply(this, arguments)} module.exports = req("/src/stable/jshint.js"); -}); \ No newline at end of file +}); diff --git a/lib/ace/mode/javascript_worker_test.js b/lib/ace/mode/javascript_worker_test.js index b8b43cba..bf6b1bfc 100644 --- a/lib/ace/mode/javascript_worker_test.js +++ b/lib/ace/mode/javascript_worker_test.js @@ -87,6 +87,15 @@ module.exports = { assert.equal(error.type, "error"); assert.equal(error.row, 0); assert.equal(error.column, 4); + }, + + "test for each": function() { + var worker = new JavaScriptWorker(this.sender); + worker.setValue("for each(var i in x)'"); + worker.deferredUpdate.call(); + + var error = this.sender.events[0][1][0]; + assert.equal(error.text, "Expected '(' and instead saw 'each'."); } };