Refactoring: aliasing requirejs module names

[fnpeditor.git] / modules / documentCanvas / documentCanvas.js

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index dbbbd0e..3ebab2e 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -1,19 +1,16 @@
 // Module that implements main WYSIWIG edit area
 
 define([
-'libs/underscore-min',
-'./transformations', 
-'./canvas',
-'./canvasManager',
+'libs/underscore',
 './canvas/canvas',
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) {
+'./commands',
+'libs/text!./template.html'], function(_, canvas3, commands, template) {
 
 'use strict';
 
 return function(sandbox) {
 
-    var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
-    var manager;
+    var canvas = canvas3.fromXML('', sandbox.publish);
     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,
@@ -41,13 +38,12 @@ return function(sandbox) {
             return canvasWrapper;
         },
         setDocument: function(xml) {
-            canvas.loadWlxml(xml); //canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
+            canvas.loadWlxml(xml);
             canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
-            manager = new CanvasManager(canvas, sandbox);
             sandbox.publish('documentSet');
         },
         getDocument: function() {
-            return transformations.toXML.getXML(canvas.getContent());
+            return canvas.toXML();
         },
         modifyCurrentNodeElement: function(attr, value) {
             var currentNodeElement = canvas.getCurrentNodeElement();
@@ -56,18 +52,20 @@ return function(sandbox) {
             } else {
                 currentNodeElement.setWlxmlMetaAttr(attr, value);
             }
+            sandbox.publish('currentNodeElementChanged', currentNodeElement);
         },
         highlightElement: function(element) {
-            canvas.highlightElement(element);
+            element.toggleHighlight(true);
         },
         dimElement: function(element) {
-            canvas.dimElement(element);
+            element.toggleHighlight(false);
         },
         jumpToElement: function(element) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {
-            manager.command(command, params);
+            commands.run(command, params, canvas);
+            sandbox.publish('contentChanged');
         }
     };