jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix typo in noworker detection

Browse source
This commit is contained in:
nightwing 2013-07-09 18:22:18 +04:00
commit 49967c139a
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
demo/kitchen-sink/demo.js
View file

@ -71,7 +71,7 @@ var IncrementalSearch = require("ace/incremental_search").IncrementalSearch;
var workerModule = require("ace/worker/worker_client"); var workerModule = require("ace/worker/worker_client");
if (location.href.indexOf("noworker" !== -1)) { if (location.href.indexOf("noworker") !== -1) {
workerModule.WorkerClient = workerModule.UIWorkerClient; workerModule.WorkerClient = workerModule.UIWorkerClient;
} }

2
lib/ace/mode/javascript/jshint.js
View file

@ -5308,7 +5308,7 @@ var JSHINT = (function () {
nobreaknonadjacent(state.tokens.prev, state.tokens.curr); nobreaknonadjacent(state.tokens.prev, state.tokens.curr);
nonadjacent(state.tokens.curr, state.tokens.next); nonadjacent(state.tokens.curr, state.tokens.next);
} }
if (s === "in" && left.id === "!") { if (s === "in" && left && left.id === "!") {
warning("W018", left, "!"); warning("W018", left, "!");
} }
if (typeof f === "function") { if (typeof f === "function") {

9
lib/ace/mode/javascript_worker_test.js
View file

@ -87,6 +87,15 @@ module.exports = {
assert.equal(error.type, "error"); assert.equal(error.type, "error");
assert.equal(error.row, 0); assert.equal(error.row, 0);
assert.equal(error.column, 4); 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'.");
} }
}; };