fix: correctly showing current document version number after document got saved

[fnpeditor.git] / src / smartxml / core.js

diff --git a/src/smartxml/core.js b/src/smartxml/core.js
index bab584e..867353d 100644 (file)
--- a/src/smartxml/core.js
+++ b/src/smartxml/core.js
@@ -1,8 +1,10 @@
-define([
-
-], function() {
+define(function(require) {

     
 'use strict';
     
 'use strict';

+/* globals Node */
+
+var _ = require('libs/underscore'),
+    TEXT_NODE = Node.TEXT_NODE;

 
 
 var INSERTION = function(implementation) {
 
 
 var INSERTION = function(implementation) {


@@ -81,7 +83,7 @@ var elementNodeTransformations = {
             this.prev().appendText(next.getText());
             next.detach();
         }
             this.prev().appendText(next.getText());
             next.detach();
         }

-        return DocumentNode.prototype.detach.call(this);
+        return this.__super__.detach();

     },
 
     setTag: function(tagName) {
     },
 
     setTag: function(tagName) {


@@ -97,6 +99,8 @@ var elementNodeTransformations = {
         if(this.sameNode(this.document.root)) {
             this.document._defineDocumentProperties(node._$);
         }
         if(this.sameNode(this.document.root)) {
             this.document._defineDocumentProperties(node._$);
         }

+
+        /* TODO: This invalidates old references to this node. Caching instances on nodes would fix this. */

         this._$.replaceWith(node._$);
         this._setNativeNode(node._$[0]);
         this._$.append(myContents);
         this._$.replaceWith(node._$);
         this._setNativeNode(node._$[0]);
         this._$.append(myContents);


@@ -185,7 +189,6 @@ var elementNodeTransformations = {
 
 var textNodeTransformations = {
     setText: function(text) {
 
 var textNodeTransformations = {
     setText: function(text) {

-        //console.log('smartxml: ' + text);

         this.nativeNode.data = text;
         this.triggerTextChangeEvent();
     },
         this.nativeNode.data = text;
         this.triggerTextChangeEvent();
     },


@@ -210,7 +213,7 @@ var textNodeTransformations = {
                 _with: {tagName: desc.tagName, attrs: desc.attrs}
             });
         } else {
                 _with: {tagName: desc.tagName, attrs: desc.attrs}
             });
         } else {

-            return DocumentNode.prototype.wrapWith.call(this, desc);
+            return this.__super__.wrapWith.call(this, desc);

         }
     },
 
         }
     },
 


@@ -250,6 +253,27 @@ var textNodeTransformations = {
         });
 
         return {first: parentElement, second: newElement};
         });
 
         return {first: parentElement, second: newElement};

+    },
+
+    divideWithElementNode: function(node, params) {
+        var insertion = this.getNodeInsertion(node),
+            myText = this.getText();
+
+        if(params.offset === myText.length) {
+            return this.after(node);
+        }
+        if(params.offset === 0) {
+            return this.before(node);
+        }
+
+        var lhsText = myText.substr(0, params.offset),
+            rhsText = myText.substr(params.offset),
+            rhsTextNode = this.document.createDocumentNode({text: rhsText});
+
+        this.setText(lhsText);
+        this.after(insertion.ofNode);
+        insertion.ofNode.after(rhsTextNode);
+        return insertion.ofNode;

     }
 };
 
     }
 };
 


@@ -342,11 +366,11 @@ var documentTransformations = {
     replaceRoot: function(node) {
         var insertion = this.getNodeInsertion(node);
         this.root.detach();
     replaceRoot: function(node) {
         var insertion = this.getNodeInsertion(node);
         this.root.detach();

-        defineDocumentProperties(this, insertion.ofNode._$);
+        this._defineDocumentProperties(insertion.ofNode._$);

         insertion.ofNode.triggerChangeEvent('nodeAdded');
         return insertion.ofNode;
     }
         insertion.ofNode.triggerChangeEvent('nodeAdded');
         return insertion.ofNode;
     }

-}
+};

 
 return {
     document: {
 
 return {
     document: {