revert changes to worker

lib/ace/editor.js

@@ -46,7 +46,6 @@ var Search = require("./search").Search;
 var Range = require("./range").Range;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var CommandManager = require("./commands/command_manager").CommandManager;
-var Autocomplete = require("./autocomplete").Autocomplete;
 var defaultCommands = require("./commands/default_commands").commands;
 var config = require("./config");
 
@@ -90,7 +89,6 @@ var Editor = function(renderer, session) {
     });
 
     this.setSession(session || new EditSession(""));
-    Autocomplete.addTo(this);
     config.resetOptions(this);
     config._emit("editor", this);
 };

lib/ace/mode/golang.js

@@ -1,24 +1,24 @@
 define(function(require, exports, module) {
 
-    var oop = require("../lib/oop");
+var oop = require("../lib/oop");
-    var TextMode = require("./text").Mode;
+var TextMode = require("./text").Mode;
-    var Tokenizer = require("../tokenizer").Tokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
-    var GolangHighlightRules = require("./golang_highlight_rules").GolangHighlightRules;
+var GolangHighlightRules = require("./golang_highlight_rules").GolangHighlightRules;
-    var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-    var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-    var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
-    var Mode = function() {
+var Mode = function() {
     var highlighter = new GolangHighlightRules();
 
     this.$tokenizer = new Tokenizer(highlighter.getRules());
     this.$keywordList = highlighter.$keywordList;
     this.$outdent = new MatchingBraceOutdent();
     this.foldingRules = new CStyleFoldMode();
-    };
+};
-    oop.inherits(Mode, TextMode);
+oop.inherits(Mode, TextMode);
 
-    (function() {
+(function() {
     
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
@@ -52,7 +52,7 @@ define(function(require, exports, module) {
         this.$outdent.autoOutdent(doc, row);
     };
 
-    }).call(Mode.prototype);
+}).call(Mode.prototype);
 
-    exports.Mode = Mode;
+exports.Mode = Mode;
 });

lib/ace/mode/pgsql.js

@@ -30,21 +30,21 @@
 
 define(function(require, exports, module) {
 
-    var oop = require("../lib/oop");
+var oop = require("../lib/oop");
-    var TextMode = require("../mode/text").Mode;
+var TextMode = require("../mode/text").Mode;
-    var Tokenizer = require("../tokenizer").Tokenizer;
+var Tokenizer = require("../tokenizer").Tokenizer;
-    var PgsqlHighlightRules = require("./pgsql_highlight_rules").PgsqlHighlightRules;
+var PgsqlHighlightRules = require("./pgsql_highlight_rules").PgsqlHighlightRules;
-    var Range = require("../range").Range;
+var Range = require("../range").Range;
 
-    var Mode = function() {
+var Mode = function() {
     var highlighter = new PgsqlHighlightRules();
 
     this.$tokenizer = new Tokenizer(highlighter.getRules());
     this.$keywordList = highlighter.$keywordList;
-    };
+};
-    oop.inherits(Mode, TextMode);
+oop.inherits(Mode, TextMode);
 
-    (function() {
+(function() {
     this.lineCommentStart = "--";
     this.blockComment = {start: "/*", end: "*/"};
 
@@ -56,7 +56,7 @@ define(function(require, exports, module) {
         }
     }
 
-    }).call(Mode.prototype);
+}).call(Mode.prototype);
 
-    exports.Mode = Mode;
+exports.Mode = Mode;
 });

lib/ace/worker/mirror.js

@@ -7,14 +7,12 @@ var lang = require("../lib/lang");
 var Mirror = exports.Mirror = function(sender) {
     this.sender = sender;
     var doc = this.doc = new Document("");
-    this.data = {};
     
     var deferredUpdate = this.deferredUpdate = lang.delayedCall(this.onUpdate.bind(this));
     
     var _self = this;
     sender.on("change", function(e) {
         doc.applyDeltas(e.data);
-        if (_self.$defer)
         deferredUpdate.schedule(_self.$timeout);
     });
 };
@@ -22,19 +20,13 @@ var Mirror = exports.Mirror = function(sender) {
 (function() {
     
     this.$timeout = 500;
-    this.$defer = true;
     
     this.setTimeout = function(timeout) {
         this.$timeout = timeout;
     };
     
-    this.setDeferredUpdate = function(defer) {
+    this.setValue = function(value) {
-        this.$defer = defer;
-    };
-
-    this.setValue = function(value, data) {
         this.doc.setValue(value);
-        this.data = data;
         this.deferredUpdate.schedule(this.$timeout);
     };
     

lib/ace/worker/worker_client.js

@@ -144,12 +144,12 @@ var WorkerClient = function(topLevelNamespaces, mod, classname) {
         catch(ex) {}
     };
 
-    this.attachToDocument = function(doc, data, ignore) {
+    this.attachToDocument = function(doc) {
-        if (this.$doc && !ignore)
+        if(this.$doc)
             this.terminate();
 
         this.$doc = doc;
-        this.call("setValue", [doc.getValue(), data]);
+        this.call("setValue", [doc.getValue()]);
         doc.on("change", this.changeListener);
     };