ctrl + enter creates new node element after current text element (wlxmlTag=block)

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index bde08d3..2f8dae5 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -2,18 +2,15 @@
 
 define([
 'libs/underscore-min',
 
 define([
 'libs/underscore-min',

-'./transformations', 
-'./canvas',
-'./canvasManager',

 './canvas/canvas',
 './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) {
 
 
 '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,
     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,


@@ -22,6 +19,7 @@ return function(sandbox) {
     canvasWrapper.onShow = function() {
         if(!shownAlready) {
             shownAlready = true;
     canvasWrapper.onShow = function() {
         if(!shownAlready) {
             shownAlready = true;

+            canvas.setCurrentElement(canvas.doc().getVerticallyFirstTextElement());

         } else {
             canvas.setCursorPosition(cursorPosition);
             this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(scrollbarPosition);
         } else {
             canvas.setCursorPosition(cursorPosition);
             this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(scrollbarPosition);


@@ -40,30 +38,34 @@ return function(sandbox) {
             return canvasWrapper;
         },
         setDocument: function(xml) {
             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());
             canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());

-            manager = new CanvasManager(canvas, sandbox);

             sandbox.publish('documentSet');
         },
         getDocument: function() {
             sandbox.publish('documentSet');
         },
         getDocument: function() {

-            return transformations.toXML.getXML(canvas.getContent());
+            return canvas.toXML();

         },
         modifyCurrentNodeElement: function(attr, value) {
         },
         modifyCurrentNodeElement: function(attr, value) {

+            var currentNodeElement = canvas.getCurrentNodeElement();

             if(attr === 'class' || attr === 'tag') {
             if(attr === 'class' || attr === 'tag') {

-                canvas.getCurrentNodeElement()['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);    
+                currentNodeElement['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);
+            } else {
+                currentNodeElement.setWlxmlMetaAttr(attr, value);

             }
             }

+            sandbox.publish('currentNodeElementChanged', currentNodeElement);

         },
         highlightElement: function(element) {
         },
         highlightElement: function(element) {

-            canvas.highlightElement(element);
+            element.toggleHighlight(true);

         },
         dimElement: function(element) {
         },
         dimElement: function(element) {

-            canvas.dimElement(element);
+            element.toggleHighlight(false);

         },
         jumpToElement: function(element) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {
         },
         jumpToElement: function(element) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {

-            manager.command(command, params);
+            commands.run(command, params, canvas);
+            sandbox.publish('contentChanged');

         }
     };
     
         }
     };