pressing enter makes new paragraph after image/video

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

diff --git a/src/wlxml/wlxml.js b/src/wlxml/wlxml.js
index 9fb6a98..1837e14 100644 (file)
--- a/src/wlxml/wlxml.js
+++ b/src/wlxml/wlxml.js
@@ -3,18 +3,61 @@ define([
     'libs/underscore',
     'smartxml/smartxml',
     'smartxml/transformations',
     'libs/underscore',
     'smartxml/smartxml',
     'smartxml/transformations',

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

     
 'use strict';
 
 /* globals Node */
 
 
     
 'use strict';
 
 /* globals Node */
 
 

-var AttributesList = function() {};
-AttributesList.prototype = Object.create({});
-AttributesList.prototype.keys = function() {
-    return _.keys(this);
+var WLXMLDocumentNodeMethods =  {
+    isInside: function(query) {
+        var parent = this.getParent(query);
+        return !!parent;
+    },
+    getParent: function(query) {
+        /* globals Node */
+        var me = this.nodeType === Node.ELEMENT_NODE ? [this] : [],
+            toret;
+        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;
+            }
+        }.bind(this));
+        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) {


@@ -39,7 +82,9 @@ var installObject = function(instance, klass) {
     });
     instance.object = Object.create(_.extend({}, methods, transformations));
     _.keys(methods).concat(_.keys(transformations)).forEach(function(key) {
     });
     instance.object = Object.create(_.extend({}, methods, transformations));
     _.keys(methods).concat(_.keys(transformations)).forEach(function(key) {

-        instance.object[key] = _.bind(instance.object[key], instance);
+        if(_.isFunction(instance.object[key])) {
+            instance.object[key] = _.bind(instance.object[key], instance);
+        }

     });
 };
 
     });
 };
 


@@ -49,50 +94,40 @@ var WLXMLElementNode = function(nativeNode, document) {
 };
 WLXMLElementNode.prototype = Object.create(smartxml.ElementNode.prototype);
 
 };
 WLXMLElementNode.prototype = Object.create(smartxml.ElementNode.prototype);
 

-$.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, {
+$.extend(WLXMLElementNode.prototype, WLXMLDocumentNodeMethods, smartxml.ElementNode.prototype, {

     getClass: function() {
         return this.getAttr('class') || '';
     },
     getClass: function() {
         return this.getAttr('class') || '';
     },

+    getClassHierarchy: function() {
+        return getClassLists(this.getClass());
+    },

     setClass: function(klass) {
         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);
         }
     },
     setClass: function(klass) {
         if(klass !== this.klass) {
             installObject(this, klass);
             return this.setAttr('class', klass);
         }
     },

-    is: function(klass) {
-        return this.getClass().substr(0, klass.length) === klass;
+    is: function(query) {
+        if(typeof query === 'string') {
+            query = {klass: query};
+        }
+        return (_.isUndefined(query.klass) || this.getClass().substr(0, query.klass.length) === query.klass) &&
+               (_.isUndefined(query.tagName) || this.getTagName() === query.tagName);

     },
     },

-    getMetaAttributes: function() {
-        var toret = new AttributesList(),
-            classParts = [''].concat(this.getClass().split('.')),
-            classCurrent, classDesc;
-
-        classParts.forEach(function(part) {
-            classCurrent = classCurrent ? classCurrent + '.' + part : part;
-            classDesc = this.document.options.wlxmlClasses[classCurrent];
-            if(classDesc) {
-                _.keys(classDesc.attrs).forEach(function(attrName) {
-                    toret[attrName] = _.extend({value: this.getAttr(attrName)}, classDesc.attrs[attrName]);
-                }.bind(this));
-            }
+    hasChild: function(query) {
+        return this.contents().some(function(child) {
+            return child.is(query);

         }.bind(this));
         }.bind(this));

-        return toret;
-    },
-    setMetaAttribute: function(key, value) {
-        this.setAttr(key, value);
-    },
-    getOtherAttributes: function() {
-        var toret = {},
-            node = this;
-        this.getAttrs().forEach(function(attr) {
-            if(attr.name !== 'class' && !node.isMetaAttribute(attr.name)) {
-                toret[attr.name] = {value: attr.value};
-            }
-        });
-        return toret;

     },
     },

-    isMetaAttribute: function(attrName) {
-        return attrName !== 'class' &&_.contains(_.keys(this.getMetaAttributes()), attrName);
+    find: function(query) {
+        var doc = this.document;
+        return this._$.find('*')
+            .map(function() {
+                return doc.createDocumentNode(this);
+            })
+            .filter(function() {
+                return this.is(query);
+            });

     },
 
     _getXMLDOMToDump: function() {
     },
 
     _getXMLDOMToDump: function() {


@@ -149,36 +184,30 @@ $.extend(WLXMLElementNode.prototype, smartxml.ElementNode.prototype, {
                     $(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);
+};
+WLXMLTextNode.prototype = Object.create(smartxml.TextNode.prototype);
+$.extend(WLXMLTextNode.prototype, WLXMLDocumentNodeMethods, {
+    is: function() { return false; }
+});
+

 var WLXMLDocument = function(xml, options) {
     this.classMethods = {};
     this.classTransformations = {};
 var WLXMLDocument = function(xml, options) {
     this.classMethods = {};
     this.classTransformations = {};

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

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


@@ -188,6 +217,7 @@ var formatter_prefix = '_wlxml_formatter_';
 WLXMLDocument.prototype = Object.create(smartxml.Document.prototype);
 $.extend(WLXMLDocument.prototype, {
     ElementNodeFactory: WLXMLElementNode,
 WLXMLDocument.prototype = Object.create(smartxml.Document.prototype);
 $.extend(WLXMLDocument.prototype, {
     ElementNodeFactory: WLXMLElementNode,

+    TextNodeFactory: WLXMLTextNode,

     loadXML: function(xml) {
         smartxml.Document.prototype.loadXML.call(this, xml, {silent: true});
         this.trigger('contentSet');
     loadXML: function(xml) {
         smartxml.Document.prototype.loadXML.call(this, xml, {silent: true});
         this.trigger('contentSet');


@@ -208,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;})


@@ -217,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) {


@@ -258,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


@@ -297,8 +334,9 @@ $.extend(WLXMLDocument.prototype, {
 
     registerClassTransformation: function(Transformation, className) {
         var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || {});
 
     registerClassTransformation: function(Transformation, className) {
         var thisClassTransformations = (this.classTransformations[className] = this.classTransformations[className] || {});

-        thisClassTransformations[Transformation.prototype.name] = function(args) {
+        thisClassTransformations[Transformation.prototype.name] = function() {

             var nodeInstance = this;
             var nodeInstance = this;

+            var args = Array.prototype.slice.call(arguments, 0);

             return nodeInstance.transform(Transformation, args);
         };
     },
             return nodeInstance.transform(Transformation, args);
         };
     },


@@ -309,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;
 


@@ -334,22 +371,17 @@ $.extend(WLXMLDocument.prototype, {
 
 });
 
 
 });
 

-var wlxmlClasses = {
-    'link': {
-        attrs: {href: {type: 'string'}}
-    }
-};
-
-

 return {
 return {

-    WLXMLDocumentFromXML: function(xml, options) {
-        options = _.extend({wlxmlClasses: wlxmlClasses}, options);
-        return new WLXMLDocument(xml, options);
+    WLXMLDocumentFromXML: function(xml, options, Factory) {
+        Factory = Factory || WLXMLDocument;
+        return new Factory(xml, options);

     },
     },

-

     WLXMLElementNodeFromXML: function(xml) {
         return this.WLXMLDocumentFromXML(xml).root;
     WLXMLElementNodeFromXML: function(xml) {
         return this.WLXMLDocumentFromXML(xml).root;

-    }
+    },
+
+    WLXMLDocument: WLXMLDocument,
+    getClassHierarchy: getClassLists

 };
 
 });
\ No newline at end of file
 };
 
 });
\ No newline at end of file