Editor does not know about menu

Menu API simplified
Renamed navigator => menuRenderer
Menu does not know about menuRenderer

Author: yangit

puddle-editor/source/lib/editor.js

@@ -5,9 +5,10 @@ var $ = require('jquery');
 var io = require('socket.io-client');
 var syntax = require('./puddle-syntax-0.1.2');
 var syntaxNew = require('puddle-syntax');
+var EventEmitter = require('events').EventEmitter;
+var emitter = new EventEmitter();
 var assert = require('./assert');
 var view = require('./view');
-var menu = global.menu = require('./menu');
 var corpus = require('./corpus');
 var debug = require('debug')('puddle:editor');
 var trace = require('./trace')(debug);
@@ -75,7 +76,7 @@ var insertLine = function (line, done, fail) {
 };
 
 // incoming create
-var onInsertLine = function (id,line) {
+var onInsertLine = function (id, line) {
     ids.push(id);
     var churchTerm = syntaxNew.compiler.load(line);
     var root = syntax.tree.load(churchTerm);
@@ -223,6 +224,7 @@ var initCursor = function () {
 
 var moveCursorLine = function (delta) {
     trace('moveCursorLine', arguments);
+
     if (lineChanged) {
         commitLine();
     }
@@ -250,7 +252,9 @@ var moveCursor = function (direction) {
         }
     };
 };
-shared.actions = {
+
+
+var pureActions = {
     commitLine: commitLine,
     revertLine: function () {
         trace('revertLine', arguments);
@@ -324,6 +328,13 @@ shared.actions = {
     widenSelection: moveCursor('U')
 };
 
+var sharedActions = _.each(pureActions, function (value, key, hash) {
+    hash[key] = function () {
+        value.apply(this,_.toArray(arguments));
+        emitter.emit('update');
+    };
+});
+
 module.exports = {
     main: function () {
         loadAllLines();
@@ -343,7 +354,6 @@ module.exports = {
             }
         });
         initCursor();
-        menu.init(shared);
     },
     getTerms: function () {
         return ids.map(function (id) {
@@ -355,6 +365,16 @@ module.exports = {
         remove: onRemoveLine,
         update: onUpdateLine
     },
-    shared: shared
+    getActions: function () {
+        return sharedActions;
+    },
+    on: _.bind(emitter.on, emitter),
+    getCursor: function () {
+        return shared.cursor;
+    },
+    //TODO this function has to be replaced by methods of forest.
+    getCorpus: function () {
+        return corpus;
+    }
 
 };

puddle-editor/source/lib/main.js

@@ -2,13 +2,16 @@
 
 var corpus = global.corpus = require('./corpus');
 var editor = global.editor = require('./editor');
+var Menu = require('./menu/menu');
+var menuRenderer = require('./menu/menuRenderer');
 var serverSyntax = require('./server-syntax');
 var _ = require('lodash');
 var puddleSocket = global.puddleSocket;
 
 var debug = require('debug')('puddle:editor:main');
 var trace = require('./trace')(debug);
 
+//TODO refactor editor to expose reset method
 var initEditor = _.once(function () {
     trace('Init editor');
     var newData = [];
@@ -20,6 +23,9 @@ var initEditor = _.once(function () {
 
     corpus.loadAll(newData);
     editor.main();
+    //TODO refactor for better API
+    var menu = Menu(editor);
+    menuRenderer(menu, editor);
 });
 
 var reinitEditor = function () {
@@ -45,3 +51,4 @@ puddleSocket.on('update', function (id, obj) {
 
 
 
+