reorganize js worker code

lib/ace/mode/javascript/jslex.js

@@ -49,7 +49,7 @@
 
  define(function(require, exports, module) {
 
-    var definitions = require("ace/narcissus/jsdefs");
+    var definitions = require("ace/mode/javascript/jsdefs");
 
     // Set constants in the local scope.
     eval(definitions.consts);

lib/ace/mode/javascript/jsparse.js

@@ -51,8 +51,8 @@
 
 define(function(require, exports, module) {
 
-    var lexer = require("ace/narcissus/jslex");
+    var lexer = require("ace/mode/javascript/jslex");
-    var definitions = require("ace/narcissus/jsdefs");
+    var definitions = require("ace/mode/javascript/jsdefs");
 
     const StringMap = definitions.StringMap;
     const Stack = definitions.Stack;

lib/ace/mode/javascript_worker.js

@@ -2,8 +2,8 @@ define(function(require, exports, module) {
     
 var oop = require("ace/lib/oop");
 var Mirror = require("ace/worker/mirror").Mirror;
-//var lint = require("ace/worker/jslint").JSLINT;
+var lint = require("ace/mode/javascript/jshint").JSHINT;
-var lint = require("ace/worker/jshint").JSHINT;
+var Parser = require("ace/mode/javascript/jsparse");
     
 var JavaScriptWorker = exports.JavaScriptWorker = function(sender) {
     Mirror.call(this, sender);
@@ -18,13 +18,9 @@ oop.inherits(JavaScriptWorker, Mirror);
         var value = this.doc.getValue();
         value = value.replace(/^#!.*\n/, "\n");
         
-//        var start = new Date();
-        var parser = require("ace/narcissus/jsparse");
         try {
-            parser.parse(value);
+            Parser.parse(value);
         } catch(e) {
-//            console.log("narcissus")
-//            console.log(e);
             this.sender.emit("narcissus", {
                 row: e.lineno-1,
                 column: null, // TODO convert e.cursor
@@ -32,15 +28,10 @@ oop.inherits(JavaScriptWorker, Mirror);
                 type: "error"
             });
             return;
-        } finally {
-//            console.log("parse time: " + (new Date() - start));
         }
         
-//        var start = new Date();
-//        console.log("jslint")
         lint(value, {undef: false, onevar: false, passfail: false});
         this.sender.emit("jslint", lint.errors);        
-//        console.log("lint time: " + (new Date() - start));
     }
     
 }).call(JavaScriptWorker.prototype);