minor cleanup

[fnpeditor.git] / src / wlxml / wlxml.js

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 21623c5..d05eb64 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -4,8 +4,9 @@ define([
     'smartxml/smartxml',
     'smartxml/transformations',
     'wlxml/extensions/metadata/metadata',
     'smartxml/smartxml',
     'smartxml/transformations',
     'wlxml/extensions/metadata/metadata',

-    'wlxml/extensions/comments/comments'
-], function($, _, smartxml, transformations, metadataExtension, commentExtension) {
+    'wlxml/extensions/comments/comments',
+    'wlxml/extensions/edumed/edumed'
+], function($, _, smartxml, transformations, metadataExtension, commentExtension, edumedExtension) {

     
 'use strict';
 
     
 'use strict';
 


@@ -24,11 +25,39 @@ var WLXMLDocumentNodeMethods =  {
         me.concat(this.parents()).some(function(node) {
             if(node.is(query)) {
                 toret = node;
         me.concat(this.parents()).some(function(node) {
             if(node.is(query)) {
                 toret = node;

+            }
+            return !!toret || (!node.sameNode(this) && node.isContextRoot());
+        }.bind(this));
+
+        return toret;
+    },
+    isContextRoot: function() {
+        var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [],
+            toret = false;
+        if(!this.parent()) {
+            return true;
+        }
+        me.concat(this.parents()).some(function(node) {
+            if(_.isFunction(node.object.isContextRoot) && node.object.isContextRoot(this)) {
+                toret = true;

                 return true;
             }
                 return true;
             }

-        });
+        }.bind(this));

         return toret;
     },
         return toret;
     },

+    getContextRoot: function() {
+        var contextRoot;
+        [this].concat(this.parents()).some(function(n) {
+            if(n.isContextRoot()) {
+                contextRoot = n;
+                return true;
+            }
+        });
+        return contextRoot;
+    },
+    hasSameContextRoot: function(other) {
+        return this.getContextRoot().sameNode(other.getContextRoot());
+    }

 };
 
 var getClassLists = function(klassName) {
 };
 
 var getClassLists = function(klassName) {


@@ -90,6 +119,16 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN
             return child.is(query);
         }.bind(this));
     },
             return child.is(query);
         }.bind(this));
     },

+    find: function(query) {
+        var doc = this.document;
+        return this._$.find('*')
+            .map(function() {
+                return doc.createDocumentNode(this);
+            })
+            .filter(function() {
+                return this.is(query);
+            });
+    },

 
     _getXMLDOMToDump: function() {
         var DOM = this._$.clone(true, true),
 
     _getXMLDOMToDump: function() {
         var DOM = this._$.clone(true, true),


@@ -145,33 +184,18 @@ $.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementN
                     $(this).prepend(metaNode);
                 }
             }
                     $(this).prepend(metaNode);
                 }
             }

-

         });
 
         });
 

-        
-

         return DOM;
     }
 });
 
         return DOM;
     }
 });
 

-// WLXMLElementNode.prototype.transformations.register(transformations.createContextTransformation({
-//     name: 'wlxml.setMetaAttribute',
-//     impl: function(args) {
-//         this.setMetaAttribute(args.name, args.value);
-//     },
-//     getChangeRoot: function() {
-//         return this.context;
-//     }
-// }));
-
-

 
 var WLXMLDocumentNode = function() {
     smartxml.DocumentNode.apply(this, arguments);
 };
 WLXMLDocumentNode.prototype = Object.create(smartxml.DocumentNode.prototype);
 
 
 var WLXMLDocumentNode = function() {
     smartxml.DocumentNode.apply(this, arguments);
 };
 WLXMLDocumentNode.prototype = Object.create(smartxml.DocumentNode.prototype);
 

-

 var WLXMLTextNode = function() {
     smartxml.TextNode.apply(this, arguments);
 };
 var WLXMLTextNode = function() {
     smartxml.TextNode.apply(this, arguments);
 };


@@ -183,7 +207,7 @@ $.extend(WLXMLTextNode.prototype, WLXMLDocumentNodeMethods, {
 var WLXMLDocument = function(xml, options) {
     this.classMethods = {};
     this.classTransformations = {};
 var WLXMLDocument = function(xml, options) {
     this.classMethods = {};
     this.classTransformations = {};

-    smartxml.Document.call(this, xml, [metadataExtension, commentExtension]);
+    smartxml.Document.call(this, xml, [metadataExtension, commentExtension, edumedExtension]);

     this.options = options;
 };
 
     this.options = options;
 };
 


@@ -214,6 +238,12 @@ $.extend(WLXMLDocument.prototype, {
             metadataNode.remove();
         });
         nativeNode.normalize();
             metadataNode.remove();
         });
         nativeNode.normalize();

+        $(nativeNode).find('*').each(function() {
+            if (this.childNodes.length === 0) {
+                var fakeTextNode = window.document.createTextNode("");
+                this.appendChild(fakeTextNode);
+            }
+        });

 
         $(nativeNode).find(':not(iframe)').addBack().contents()
             .filter(function() {return this.nodeType === Node.TEXT_NODE;})
 
         $(nativeNode).find(':not(iframe)').addBack().contents()
             .filter(function() {return this.nodeType === Node.TEXT_NODE;})


@@ -223,7 +253,8 @@ $.extend(WLXMLDocument.prototype, {
                     elParent = el.parent(),
                     hasSpanParent = elParent.prop('tagName') === 'SPAN',
                     hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN',
                     elParent = el.parent(),
                     hasSpanParent = elParent.prop('tagName') === 'SPAN',
                     hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN',

-                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN';
+                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN',
+                    onlyChild = el.is(':only-child');

 
 
                 var addInfo = function(toAdd, where, transformed, original) {
 
 
                 var addInfo = function(toAdd, where, transformed, original) {


@@ -264,7 +295,7 @@ $.extend(WLXMLDocument.prototype, {
                     }
                 }
 
                     }
                 }
 

-                if(!text.transformed) {
+                if(!text.transformed  && !onlyChild) {

                     addInfo(text.original, 'below');
                     el.remove();
                     return true; // continue
                     addInfo(text.original, 'below');
                     el.remove();
                     return true; // continue


@@ -316,7 +347,6 @@ $.extend(WLXMLDocument.prototype, {
     },
 
     registerExtension: function(extension) {
     },
 
     registerExtension: function(extension) {

-        //debugger;

         smartxml.Document.prototype.registerExtension.call(this, extension);
         var doc = this;
 
         smartxml.Document.prototype.registerExtension.call(this, extension);
         var doc = this;