Fix uneditable classname passing and add remove to handling methods.

alantsov · Sep 10, 2014 · 8b5d63b · 8b5d63b
1 parent 8bab162
commit 8b5d63b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/src/dom/parse.js b/src/dom/parse.js
@@ -70,8 +70,7 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
       DEFAULT_NODE_NAME   = "span",
       WHITE_SPACE_REG_EXP = /\s+/,
       defaultRules        = { tags: {}, classes: {} },
-      currentRules        = {},
-      uneditableClass     = false;
+      currentRules        = {};
 
   /**
    * Iterates over all childs of the element, recreates them, appends them into a document fragment
@@ -92,10 +91,6 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
       clearInternals = true;
     }
 
-    if (config.uneditableClass) {
-      uneditableClass = config.uneditableClass;
-    }
-
     if (isString) {
       element = wysihtml5.dom.getAsDom(elementOrHtml, context);
     } else {
@@ -108,7 +103,7 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
 
     while (element.firstChild) {
       firstChild = element.firstChild;
-      newNode = _convert(firstChild, config.cleanUp, clearInternals);
+      newNode = _convert(firstChild, config.cleanUp, clearInternals, config.uneditableClass);
       if (newNode) {
         fragment.appendChild(newNode);
       }
@@ -134,7 +129,7 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
     return isString ? wysihtml5.quirks.getCorrectInnerHTML(element) : element;
   }
 
-  function _convert(oldNode, cleanUp, clearInternals) {
+  function _convert(oldNode, cleanUp, clearInternals, uneditableClass) {
     var oldNodeType     = oldNode.nodeType,
         oldChilds       = oldNode.childNodes,
         oldChildsLength = oldChilds.length,
@@ -159,7 +154,7 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
 
             for (i = oldChildsLength; i--;) {
               if (oldChilds[i]) {
-                newChild = _convert(oldChilds[i], cleanUp, clearInternals);
+                newChild = _convert(oldChilds[i], cleanUp, clearInternals, uneditableClass);
                 if (newChild) {
                   if (oldChilds[i] === newChild) {
                     i--;
@@ -201,7 +196,7 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
     // Converts all childnodes
     for (i=0; i<oldChildsLength; i++) {
       if (oldChilds[i]) {
-        newChild = _convert(oldChilds[i], cleanUp, clearInternals);
+        newChild = _convert(oldChilds[i], cleanUp, clearInternals, uneditableClass);
         if (newChild) {
           if (oldChilds[i] === newChild) {
             i--;
@@ -832,6 +827,10 @@ wysihtml5.dom.parse = function(elementOrHtml_current, config_current) {
   var elementHandlingMethods = {
     unwrap: function (element) {
       wysihtml5.dom.unwrap(element);
+    },
+
+    remove: function (element) {
+      element.parentNode.removeChild(element);
     }
   };
 

diff --git a/src/quirks/clean_pasted_html.js b/src/quirks/clean_pasted_html.js
@@ -66,7 +66,7 @@ wysihtml5.quirks.cleanPastedHTML = (function() {
       "rules": rules,
       "cleanUp": true, // <span> elements, empty or without attributes, should be removed/replaced with their content
       "context": options.referenceNode.ownerDocument,
-      "uneditableClass": options.uneditableContainerClassname,
+      "uneditableClass": options.uneditableClass,
       "clearInternals" : true, // don't paste temprorary selection and other markings
       "unjoinNbsps" : true
     });