Jumping to paren parent on text unwrap

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 9488aed..4cf3558 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -15,6 +15,24 @@ return function(sandbox) {
     var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
     var manager;
     var canvasWrapper = $(template);
     var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
     var manager;
     var canvasWrapper = $(template);

+    var shownAlready = false;
+    var scrollbarPosition = 0,
+        cursorPosition;
+    
+    canvasWrapper.onShow = function() {
+        if(!shownAlready) {
+            shownAlready = true;
+            canvas.setCurrentElement(canvas.doc().getVerticallyFirstTextElement());
+        } else {
+            canvas.setCursorPosition(cursorPosition);
+            this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(scrollbarPosition);
+        }
+    };
+    
+    canvasWrapper.onHide = function() {
+       scrollbarPosition = this.find('#rng-module-documentCanvas-contentWrapper').scrollTop();
+       cursorPosition = canvas.getCursor().getPosition();
+    };

 
     /* public api */
     return {
 
     /* public api */
     return {


@@ -32,9 +50,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);