convert to APF style mixins

src/BackgroundTokenizer.js

@@ -44,7 +44,7 @@ ace.BackgroundTokenizer = function(tokenizer) {
 
 (function(){
 
-    ace.mixin(this, ace.MEventEmitter);
+    ace.implement(this, ace.MEventEmitter);
 
     this.setTokenizer = function(tokenizer) {
         this.tokenizer = tokenizer;

src/Document.js

@@ -15,7 +15,7 @@ ace.Document = function(text, mode) {
 
 (function() {
 
-    ace.mixin(ace.Document.prototype, ace.MEventEmitter);
+    ace.implement(this, ace.MEventEmitter);
 
     this._split = function(text) {
         return text.split(/\r\n|\r|\n/);

src/MEventEmitter.js

@@ -1,10 +1,12 @@
 ace.provide("ace.MEventEmitter");
 
-ace.MEventEmitter.$initEvents = function() {
+ace.MEventEmitter = function() {
-    this._eventRegistry = {};
-};
 
-ace.MEventEmitter.$dispatchEvent = function(eventName, e) {
+    this.$initEvents = function() {
+        this._eventRegistry = {};
+    };
+
+    this.$dispatchEvent = function(eventName, e) {
         var listeners = this._eventRegistry[eventName];
         if (!listeners || !listeners.length) return;
 
@@ -14,9 +16,9 @@ ace.MEventEmitter.$dispatchEvent = function(eventName, e) {
         for (var i=0; i<listeners.length; i++) {
             listeners[i](e);
         }
-};
+    };
 
-ace.MEventEmitter.addEventListener = function(eventName, callback) {
+    this.addEventListener = function(eventName, callback) {
         var listeners = this._eventRegistry[eventName];
         if (!listeners) {
           var listeners = this._eventRegistry[eventName] = [];
@@ -24,9 +26,9 @@ ace.MEventEmitter.addEventListener = function(eventName, callback) {
         if (ace.arrayIndexOf(listeners, callback) == -1) {
             listeners.push(callback);
         }
-};
+    };
 
-ace.MEventEmitter.removeEventListener = function(eventName, callback) {
+    this.removeEventListener = function(eventName, callback) {
         var listeners = this._eventRegistry[eventName];
         if (!listeners) {
           return;
@@ -35,4 +37,5 @@ ace.MEventEmitter.removeEventListener = function(eventName, callback) {
         if (index !== -1) {
             listeners.splice(index, 1);
         }
+    };
 };

src/ScrollBar.js

@@ -19,7 +19,7 @@ ace.ScrollBar = function(parent) {
 
 (function() {
 
-    ace.mixin(ace.ScrollBar.prototype, ace.MEventEmitter);
+    ace.implement(this, ace.MEventEmitter);
 
     this.onScroll = function() {
       this.$dispatchEvent("scroll", {data: this.element.scrollTop});

src/Selection.js

@@ -14,7 +14,7 @@ ace.Selection = function(doc) {
 
 (function() {
 
-    ace.mixin(ace.Selection.prototype, ace.MEventEmitter);
+    ace.implement(this, ace.MEventEmitter);
 
     this.updateCursor = function() {
         this.$dispatchEvent("changeCursor", { data: this.getCursor() });

src/ace.js

@@ -21,10 +21,8 @@ ace.inherits = function(ctor, superCtor) {
     ctor.prototype.constructor = ctor;
 };
 
-ace.mixin = function(obj, mixin) {
+ace.implement = function(proto, mixin) {
-    for (var key in mixin) {
+    mixin.call(proto);
-        obj[key] = mixin[key];
-    }
 };
 
 ace.addListener = function(elem, type, callback) {

test/EventEmitterTest.js

@@ -1,7 +1,7 @@
 var EventEmitter = function() {
     this.$initEvents();
 };
-ace.mixin(EventEmitter.prototype, ace.MEventEmitter);
+ace.implement(EventEmitter.prototype, ace.MEventEmitter);
 
 var EventEmitterTest = new TestCase("EventEmitterTest", {
     "test: dispatch event with no data" : function() {