Setting caret after moving list elements up one level

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index bde08d3..73917f7 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -6,7 +6,8 @@ define([
 './canvas',
 './canvasManager',
 './canvas/canvas',
 './canvas',
 './canvasManager',
 './canvas/canvas',

-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) {
+'./commands',
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, commands, template) {

 
 'use strict';
 
 
 'use strict';
 


@@ -22,6 +23,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);


@@ -49,9 +51,13 @@ return function(sandbox) {
             return transformations.toXML.getXML(canvas.getContent());
         },
         modifyCurrentNodeElement: function(attr, value) {
             return transformations.toXML.getXML(canvas.getContent());
         },
         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) {
             canvas.highlightElement(element);
         },
         highlightElement: function(element) {
             canvas.highlightElement(element);


@@ -63,7 +69,7 @@ return function(sandbox) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {

-            manager.command(command, params);
+            commands.run(command, params, canvas);

         }
     };
     
         }
     };