locomotivecms 4.1.0 → 4.2.0.alpha1

data/vendor/assets/javascripts/locomotive/wysihtml5x-toolbar.js

@@ -1,5 +1,5 @@
 /**
- * @license wysihtml v0.5.1
+ * @license wysihtml v0.5.5
  * https://github.com/Voog/wysihtml
  *
  * Author: Christopher Blum (https://github.com/tiff)
@@ -10,7 +10,7 @@
  *
  */
 var wysihtml5 = {
-  version: "0.5.1",
+  version: "0.5.5",
 
   // namespaces
   commands:   {},
@@ -24,6 +24,8 @@ var wysihtml5 = {
   INVISIBLE_SPACE: "\uFEFF",
   INVISIBLE_SPACE_REG_EXP: /\uFEFF/g,
 
+  VOID_ELEMENTS: "area, base, br, col, embed, hr, img, input, keygen, link, meta, param, source, track, wbr",
+
   EMPTY_FUNCTION: function() {},
 
   ELEMENT_NODE: 1,
@@ -38,7 +40,7 @@ var wysihtml5 = {
 };
 ;wysihtml5.polyfills = function(win, doc) {
 
-  // TODO: in future try to replace most inline compability checks with polyfills for code readability
+  // TODO: in future try to replace most inline compability checks with polyfills for code readability 
 
   // IE8 SUPPORT BLOCK
   // You can compile without all this if IE8 is not needed
@@ -133,20 +135,36 @@ var wysihtml5 = {
     };
   }
 
-  // Element.matches Adds ie8 support and unifies nonstandard function names in other browsers
-  win.Element && function(ElementPrototype) {
-    ElementPrototype.matches = ElementPrototype.matches ||
-    ElementPrototype.matchesSelector ||
-    ElementPrototype.mozMatchesSelector ||
-    ElementPrototype.msMatchesSelector ||
-    ElementPrototype.oMatchesSelector ||
-    ElementPrototype.webkitMatchesSelector ||
-    function (selector) {
-      var node = this, nodes = (node.parentNode || node.document).querySelectorAll(selector), i = -1;
-      while (nodes[++i] && nodes[i] != node);
-      return !!nodes[i];
+  // closest and matches polyfill
+  // https://github.com/jonathantneal/closest
+  (function (ELEMENT) {
+    ELEMENT.matches = ELEMENT.matches || ELEMENT.mozMatchesSelector || ELEMENT.msMatchesSelector || ELEMENT.oMatchesSelector || ELEMENT.webkitMatchesSelector || function matches(selector) {
+      var
+      element = this,
+      elements = (element.document || element.ownerDocument).querySelectorAll(selector),
+      index = 0;
+
+      while (elements[index] && elements[index] !== element) {
+        ++index;
+      }
+
+      return elements[index] ? true : false;
+    };
+
+    ELEMENT.closest = ELEMENT.closest || function closest(selector) {
+      var element = this;
+
+      while (element) {
+        if (element.matches(selector)) {
+          break;
+        }
+
+        element = element.parentElement;
+      }
+
+      return element;
     };
-  }(win.Element.prototype);
+  }(Element.prototype));
 
   // Element.classList for ie8-9 (toggle all IE)
   // source http://purl.eligrey.com/github/classList.js/blob/master/classList.js
@@ -405,7 +423,19 @@ var wysihtml5 = {
     return all;
   };
 
+  var isInDom = function(node) {
+    var doc = node.ownerDocument,
+        n = node;
+
+    do {
+      if (n === doc) {
+        return true;
+      }
+      n = n.parentNode;
+    } while(n);
 
+    return false;
+  };
 
   var normalizeFix = function() {
     var f = Node.prototype.normalize;
@@ -466,7 +496,7 @@ var wysihtml5 = {
         aoffset = Array.prototype.indexOf.call(aelement.parentNode.childNodes, aelement);
       }
 
-      if (anode && anode.parentNode && fnode && fnode.parentNode) {
+      if (isInDom(this) && anode && anode.parentNode && fnode && fnode.parentNode) {
         r.setStart(anode, aoffset);
         r.setEnd(fnode, foffset);
         s.removeAllRanges();
@@ -475,19 +505,44 @@ var wysihtml5 = {
     };
     Node.prototype.normalize = nf;
   };
-
+  
   var F = function() {
     window.removeEventListener("load", F);
     if ("Node" in window && "normalize" in Node.prototype && normalizeHasCaretError()) {
       normalizeFix();
     }
   };
-
+  
   if (doc.readyState !== "complete") {
     window.addEventListener("load", F);
   } else {
     F();
   }
+
+  // CustomEvent for ie9 and up
+  function nativeCustomEventSupported() {
+    try {
+      var p = new CustomEvent('cat', {detail: {foo: 'bar'}});
+      return  'cat' === p.type && 'bar' === p.detail.foo;
+    } catch (e) {}
+    return false;
+  }
+  var customEventSupported = nativeCustomEventSupported();
+
+  // Polyfills CustomEvent object for IE9 and up
+  (function() {
+    if (!customEventSupported && "CustomEvent" in window) {
+      function CustomEvent(event, params) {
+        params = params || {bubbles: false, cancelable: false, detail: undefined};
+        var evt = doc.createEvent('CustomEvent');
+        evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
+        return evt;
+      }
+      CustomEvent.prototype = win.Event.prototype;
+      win.CustomEvent = CustomEvent;
+      customEventSupported = true;
+    }
+  })();
 };
 
 wysihtml5.polyfills(window, document);
@@ -4304,7 +4359,7 @@ wysihtml5.polyfills(window, document);
             win = null;
         });
     });
-
+    
 
     /*----------------------------------------------------------------------------------------------------------------*/
 
@@ -4335,7 +4390,8 @@ wysihtml5.polyfills(window, document);
     }
 
     return api;
-}, this);;/**
+}, this);
+;/**
  * Text range module for Rangy.
  * Text-based manipulation and searching of ranges and selections.
  *
@@ -4673,7 +4729,7 @@ wysihtml5.polyfills(window, document);
 
         /*----------------------------------------------------------------------------------------------------------------*/
 
-
+    
         // "A block node is either an Element whose "display" property does not have
         // resolved value "inline" or "inline-block" or "inline-table" or "none", or a
         // Document, or a DocumentFragment."
@@ -6262,7 +6318,7 @@ wysihtml5.polyfills(window, document);
             )
         };
     });
-
+    
     return rangy;
 }, this);;/**
  * Selection save and restore module for Rangy.
@@ -6513,7 +6569,7 @@ wysihtml5.polyfills(window, document);
             removeMarkers: removeMarkers
         });
     });
-
+    
     return rangy;
 }, this);;/*
   Base.js, version 1.1a
@@ -6527,7 +6583,7 @@ var Base = function() {
 
 Base.extend = function(_instance, _static) { // subclass
   var extend = Base.prototype.extend;
-
+  
   // build the prototype
   Base._prototyping = true;
   var proto = new this;
@@ -6536,7 +6592,7 @@ Base.extend = function(_instance, _static) { // subclass
     // call this method from any other method to invoke that method's ancestor
   };
   delete Base._prototyping;
-
+  
   // create the wrapper for the constructor function
   //var constructor = proto.constructor.valueOf(); //-dean
   var constructor = proto.constructor;
@@ -6551,7 +6607,7 @@ Base.extend = function(_instance, _static) { // subclass
       }
     }
   };
-
+  
   // build the class interface
   klass.ancestor = this;
   klass.extend = this.extend;
@@ -6569,7 +6625,7 @@ Base.extend = function(_instance, _static) { // subclass
   return klass;
 };
 
-Base.prototype = {
+Base.prototype = {  
   extend: function(source, value) {
     if (arguments.length > 1) { // extending with a name/value pair
       var ancestor = this[source];
@@ -6628,7 +6684,7 @@ Base = Base.extend({
 }, {
   ancestor: Object,
   version: "1.1",
-
+  
   forEach: function(object, block, context) {
     for (var key in object) {
       if (this.prototype[key] === undefined) {
@@ -6636,7 +6692,7 @@ Base = Base.extend({
       }
     }
   },
-
+    
   implement: function() {
     for (var i = 0; i < arguments.length; i++) {
       if (typeof arguments[i] == "function") {
@@ -6649,7 +6705,7 @@ Base = Base.extend({
     }
     return this;
   },
-
+  
   toString: function() {
     return String(this.valueOf());
   }
@@ -6660,10 +6716,11 @@ wysihtml5.browser = (function() {
   var userAgent   = navigator.userAgent,
       testElement = document.createElement("div"),
       // Browser sniffing is unfortunately needed since some behaviors are impossible to feature detect
-      isGecko     = userAgent.indexOf("Gecko")        !== -1 && userAgent.indexOf("KHTML") === -1,
-      isWebKit    = userAgent.indexOf("AppleWebKit/") !== -1,
-      isChrome    = userAgent.indexOf("Chrome/")      !== -1,
-      isOpera     = userAgent.indexOf("Opera/")       !== -1;
+      // We need to be extra careful about Microsoft as it shows increasing tendency of tainting its userAgent strings with false feathers
+      isGecko     = userAgent.indexOf("Gecko")        !== -1 && userAgent.indexOf("KHTML") === -1 && !isIE(),
+      isWebKit    = userAgent.indexOf("AppleWebKit/") !== -1 && !isIE(),
+      isChrome    = userAgent.indexOf("Chrome/")      !== -1 && !isIE(),
+      isOpera     = userAgent.indexOf("Opera/")       !== -1 && !isIE();
 
   function iosVersion(userAgent) {
     return +((/ipad|iphone|ipod/.test(userAgent) && userAgent.match(/ os (\d+).+? like mac os x/)) || [undefined, 0])[1];
@@ -6833,14 +6890,15 @@ wysihtml5.browser = (function() {
      */
     supportsCommand: (function() {
       // Following commands are supported but contain bugs in some browsers
+      // TODO: investigate if some of these bugs can be tested without altering selection on page, instead of targeting browsers and versions directly
       var buggyCommands = {
         // formatBlock fails with some tags (eg. <blockquote>)
         "formatBlock":          isIE(10, "<="),
          // When inserting unordered or ordered lists in Firefox, Chrome or Safari, the current selection or line gets
          // converted into a list (<ul><li>...</li></ul>, <ol><li>...</li></ol>)
          // IE and Opera act a bit different here as they convert the entire content of the current block element into a list
-        "insertUnorderedList":  isIE(9, ">=") || isIE(12, "<="),
-        "insertOrderedList":    isIE(9, ">=")|| isIE(12, "<=")
+        "insertUnorderedList":  isIE(),
+        "insertOrderedList":    isIE()
       };
 
       // Firefox throws errors for queryCommandSupported, so we have to build up our own object of supported commands
@@ -6997,6 +7055,11 @@ wysihtml5.browser = (function() {
       return isIE();
     },
 
+    /* In IE when deleting with caret at the begining of LI, List get broken into half instead of merging the LI with previous */
+    hasLiDeletingProblem: function() {
+      return isIE();
+    },
+
     hasUndoInContextMenu: function() {
       return isGecko || isChrome || isOpera;
     },
@@ -7030,6 +7093,12 @@ wysihtml5.browser = (function() {
       return isWebKit;
     },
 
+    // In all webkit browsers there are some places where caret can not be placed at the end of blocks and directly before block level element
+    //   when startContainer is element.
+    hasCaretBlockElementIssue: function() {
+      return isWebKit;
+    },
+
     supportsMutationEvents: function() {
       return ("MutationEvent" in window);
     },
@@ -7050,6 +7119,10 @@ wysihtml5.browser = (function() {
         return ("styleFloat" in document.createElement("div").style) ? "styleFloat" : "cssFloat";
       }
       return key;
+    },
+
+    usesControlRanges: function() {
+      return document.body && "createControlRange" in document.body;
     }
   };
 })();
@@ -7877,7 +7950,12 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
       is: {
         emptyTextNode: function(ignoreWhitespace) {
           var regx = ignoreWhitespace ? (/^\s*$/g) : (/^[\r\n]*$/g);
-          return node.nodeType === wysihtml5.TEXT_NODE && (regx).test(node.data);
+          return node && node.nodeType === wysihtml5.TEXT_NODE && (regx).test(node.data);
+        },
+
+        // Returns if node is the rangy selection bookmark element (that must not be taken into account in most situatons and is removed on selection restoring)
+        rangyBookmark: function() {
+          return node && node.nodeType === 1 && node.classList.contains('rangySelectionBoundary');
         },
 
         visible: function() {
@@ -7889,6 +7967,20 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
             }
           }
           return isVisible;
+        },
+        lineBreak: function() {
+          return node && node.nodeType === 1 && node.nodeName === "BR";
+        },
+        block: function() {
+          return node && node.nodeType === 1 && node.ownerDocument.defaultView.getComputedStyle(node).display === "block";
+        },
+        // Void elements are elemens that can not have content
+        // In most cases browsers should solve the cases for you when you try to insert content into those,
+        //    but IE does not and it is not nice to do so anyway.
+        voidElement: function() {
+          return wysihtml5.dom.domNode(node).test({
+            query: wysihtml5.VOID_ELEMENTS
+          });
         }
       },
 
@@ -7896,18 +7988,19 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
       prev: function(options) {
         var prevNode = node.previousSibling,
             types = (options && options.nodeTypes) ? options.nodeTypes : defaultNodeTypes;
-
+        
         if (!prevNode) {
           return null;
         }
 
         if (
+          wysihtml5.dom.domNode(prevNode).is.rangyBookmark() || // is Rangy temporary boomark element (bypass)
           (!wysihtml5.lang.array(types).contains(prevNode.nodeType)) || // nodeTypes check.
           (options && options.ignoreBlankTexts && wysihtml5.dom.domNode(prevNode).is.emptyTextNode(true)) // Blank text nodes bypassed if set
         ) {
           return wysihtml5.dom.domNode(prevNode).prev(options);
         }
-
+        
         return prevNode;
       },
 
@@ -7915,18 +8008,19 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
       next: function(options) {
         var nextNode = node.nextSibling,
             types = (options && options.nodeTypes) ? options.nodeTypes : defaultNodeTypes;
-
+        
         if (!nextNode) {
           return null;
         }
 
         if (
+          wysihtml5.dom.domNode(nextNode).is.rangyBookmark() || // is Rangy temporary boomark element (bypass)
           (!wysihtml5.lang.array(types).contains(nextNode.nodeType)) || // nodeTypes check.
           (options && options.ignoreBlankTexts && wysihtml5.dom.domNode(nextNode).is.emptyTextNode(true)) // blank text nodes bypassed if set
         ) {
           return wysihtml5.dom.domNode(nextNode).next(options);
         }
-
+        
         return nextNode;
       },
 
@@ -7989,7 +8083,7 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
       escapeParent: function(element, newWrapper) {
         var parent, split2, nodeWrap,
             curNode = node;
-
+        
         // Stop if node is not a descendant of element
         if (!wysihtml5.dom.contains(element, node)) {
           throw new Error("Child is not a descendant of node.");
@@ -8044,12 +8138,35 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
         }
       },
 
+      transferContentTo: function(targetNode, removeOldWrapper) {
+        if (node.nodeType === 1) {
+          if (wysihtml5.dom.domNode(targetNode).is.voidElement() || targetNode.nodeType === 3) {
+            while (node.lastChild) {
+              targetNode.parentNode.insertBefore(node.lastChild, targetNode.nextSibling);
+            }
+          } else {
+            while (node.firstChild) {
+              targetNode.appendChild(node.firstChild);
+            }
+          }
+          if (removeOldWrapper) {
+            node.parentNode.removeChild(node);
+          }
+        } else if (node.nodeType === 3 || node.nodeType === 8){
+          if (wysihtml5.dom.domNode(targetNode).is.voidElement()) {
+            targetNode.parentNode.insertBefore(node, targetNode.nextSibling);
+          } else {
+            targetNode.appendChild(node);
+          }
+        }
+      },
+
       /*
         Tests a node against properties, and returns true if matches.
         Tests on principle that all properties defined must have at least one match.
         styleValue parameter works in context of styleProperty and has no effect otherwise.
         Returns true if element matches and false if it does not.
-
+        
         Properties for filtering element:
         {
           query: selector string,
@@ -8082,7 +8199,7 @@ wysihtml5.dom.copyAttributes = function(attributesToCopy) {
           }
         }
 
-        if (properties.nodeName && node.nodeName !== properties.nodeName) {
+        if (properties.nodeName && node.nodeName.toLowerCase() !== properties.nodeName.toLowerCase()) {
           return false;
         }
 
@@ -9492,7 +9609,7 @@ wysihtml5.dom.renameElement = function(element, newNodeName) {
     newElement.appendChild(firstChild);
   }
   wysihtml5.dom.copyAttributes(["align", "className"]).from(element).to(newElement);
-
+  
   if (element.parentNode) {
     element.parentNode.replaceChild(newElement, element);
   }
@@ -9517,17 +9634,10 @@ wysihtml5.dom.replaceWithChildNodes = function(node) {
     return;
   }
 
-  if (!node.firstChild) {
-    node.parentNode.removeChild(node);
-    return;
-  }
-
-  var fragment = node.ownerDocument.createDocumentFragment();
   while (node.firstChild) {
-    fragment.appendChild(node.firstChild);
+    node.parentNode.insertBefore(node.firstChild, node);
   }
-  node.parentNode.replaceChild(fragment, node);
-  node = fragment = null;
+  node.parentNode.removeChild(node);
 };
 ;/**
  * Unwraps an unordered/ordered list
@@ -11116,12 +11226,12 @@ wysihtml5.dom.unwrap = function(node) {
   }
   return children;
 };
-;/*
+;/* 
  * Methods for fetching pasted html before it gets inserted into content
 **/
 
 /* Modern event.clipboardData driven approach.
- * Advantage is that it does not have to loose selection or modify dom to catch the data.
+ * Advantage is that it does not have to loose selection or modify dom to catch the data. 
  * IE does not support though.
 **/
 wysihtml5.dom.getPastedHtml = function(event) {
@@ -11142,7 +11252,7 @@ wysihtml5.dom.getPastedHtmlWithDiv = function (composer, f) {
       doc = composer.element.ownerDocument,
       cleanerDiv = doc.createElement('DIV'),
       scrollPos = composer.getScrollPos();
-
+  
   doc.body.appendChild(cleanerDiv);
 
   cleanerDiv.style.width = "1px";
@@ -11444,7 +11554,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
 };
 ;(function(wysihtml5) {
-
+  
   // List of supported color format parsing methods
   // If radix is not defined 10 is expected as default
   var colorParseMethods = {
@@ -11487,7 +11597,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     }
   }
 
-  // Takes color string value ("#abc", "rgb(1,2,3)", ...) as an argument and returns the type of that color format "hex", "rgb", "rgba".
+  // Takes color string value ("#abc", "rgb(1,2,3)", ...) as an argument and returns the type of that color format "hex", "rgb", "rgba". 
   function getColorFormat (colorStr) {
     var type = getColorParseMethod(colorStr);
 
@@ -11500,9 +11610,9 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     // Takes color string value as an argument and returns suitable parsing method for it
     getColorParseMethod : getColorParseMethod,
 
-    // Takes color string value as an argument and returns the type of that color format "hex", "rgb", "rgba".
+    // Takes color string value as an argument and returns the type of that color format "hex", "rgb", "rgba". 
     getColorFormat : getColorFormat,
-
+    
     /* Parses a color string to and array of [red, green, blue, alpha].
      * paramName: optional argument to parse color value directly from style string parameter
      *
@@ -11630,6 +11740,14 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       return ret;
   }
 
+  function getRangeNode(node, offset) {
+    if (node.nodeType === 3) {
+      return node;
+    } else {
+      return node.childNodes[offset] || node;
+    }
+  }
+
   function getWebkitSelectionFixNode(container) {
     var blankNode = document.createElement('span');
 
@@ -11656,7 +11774,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       }
     };
 
-    blankNode.appendChild(document.createTextNode(wysihtml5.INVISIBLE_SPACE));
+    blankNode.appendChild(container.ownerDocument.createTextNode(wysihtml5.INVISIBLE_SPACE));
     blankNode.className = '_wysihtml5-temp-caret-fix';
     blankNode.style.display = 'block';
     blankNode.style.minWidth = '1px';
@@ -11700,7 +11818,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     /** @scope wysihtml5.Selection.prototype */ {
     constructor: function(editor, contain, unselectableClass) {
       // Make sure that our external range library is initialized
-      window.rangy.init();
+      rangy.init();
 
       this.editor   = editor;
       this.composer = editor.composer;
@@ -11833,7 +11951,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
             if (!sel || (lastSibling === node && node.nodeType === 1 && win.getComputedStyle(node).display === "block")) {
               if (notVisual) {
                 // If setAfter is used as internal between actions, self-removing caretPlaceholder has simpler implementation
-                // and remove itself in call stack end instead on user interaction
+                // and remove itself in call stack end instead on user interaction 
                 var caretPlaceholder = this.doc.createTextNode(wysihtml5.INVISIBLE_SPACE);
                 node.parentNode.insertBefore(caretPlaceholder, node.nextSibling);
                 this.selectNode(caretPlaceholder);
@@ -12000,11 +12118,11 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       this.deleteRangeContents(range);
       this.setSelection(range);
     },
-
+    
     // Makes sure all uneditable sare notified before deleting contents
     deleteRangeContents: function (range) {
       var startParent, endParent, uneditables, ev;
-
+      
       if (this.unselectableClass) {
         if ((startParent = wysihtml5.dom.getParentElement(range.startContainer, { query: "." + this.unselectableClass }, false, this.contain))) {
           range.setStartBefore(startParent);
@@ -12027,11 +12145,16 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       range.deleteContents();
     },
 
+    getCaretNode: function () {
+      var selection = this.getSelection();
+      return (selection && selection.anchorNode) ? getRangeNode(selection.anchorNode, selection.anchorOffset) : null;
+    },
+
     getPreviousNode: function(node, ignoreEmpty) {
       var displayStyle;
       if (!node) {
         var selection = this.getSelection();
-        node = selection.anchorNode;
+        node = (selection && selection.anchorNode) ? getRangeNode(selection.anchorNode, selection.anchorOffset) : null;
       }
 
       if (node === this.contain) {
@@ -12072,6 +12195,50 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       return (ret !== this.contain) ? ret : false;
     },
 
+    // Gather info about caret location (caret node, previous and next node)
+    getNodesNearCaret: function() {
+      if (!this.isCollapsed()) {
+        throw "Selection must be caret when using selection.getNodesNearCaret()";
+      }
+
+      var r = this.getOwnRanges(),
+          caretNode, prevNode, nextNode, offset;
+
+      if (r && r.length > 0) {
+        if (r[0].startContainer.nodeType === 1) {
+          caretNode = r[0].startContainer.childNodes[r[0].startOffset - 1];
+          if (!caretNode && r[0].startOffset === 0) {
+            // Is first position before all nodes
+            nextNode = r[0].startContainer.childNodes[0];
+          } else if (caretNode) {
+            prevNode = caretNode.previousSibling;
+            nextNode = caretNode.nextSibling;
+          }
+        } else {
+          if (r[0].startOffset === 0 && r[0].startContainer.previousSibling) {
+            caretNode = r[0].startContainer.previousSibling;
+            if (caretNode.nodeType === 3) {
+              offset = caretNode.data.length; 
+            }
+          } else {
+            caretNode = r[0].startContainer;
+            offset = r[0].startOffset;
+          }
+          prevNode = caretNode.previousSibling;
+          nextNode = caretNode.nextSibling;
+        }
+
+        return {
+          "caretNode": caretNode,
+          "prevNode": prevNode,
+          "nextNode": nextNode,
+          "textOffset": offset
+        };
+      }
+
+      return null;
+    },
+
     getSelectionParentsByTag: function(tagName) {
       var nodes = this.getSelectedOwnNodes(),
           curEl, parents = [];
@@ -12107,15 +12274,24 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       return (/^\s*$/).test(endtxt);
     },
 
-    caretIsFirstInSelection: function() {
+    caretIsFirstInSelection: function(includeLineBreaks) {
       var r = rangy.createRange(this.doc),
           s = this.getSelection(),
           range = this.getRange(),
-          startNode = range.startContainer;
-
+          startNode = getRangeNode(range.startContainer, range.startOffset);
+      
       if (startNode) {
         if (startNode.nodeType === wysihtml5.TEXT_NODE) {
-          return this.isCollapsed() && (startNode.nodeType === wysihtml5.TEXT_NODE && (/^\s*$/).test(startNode.data.substr(0,range.startOffset)));
+          if (!startNode.parentNode) {
+            return false;
+          }
+          if (!this.isCollapsed() || (startNode.parentNode.firstChild !== startNode && !wysihtml5.dom.domNode(startNode.previousSibling).is.block())) {
+            return false;
+          }
+          var ws = this.win.getComputedStyle(startNode.parentNode).whiteSpace;
+          return (ws === "pre" || ws === "pre-wrap") ? range.startOffset === 0 : (/^\s*$/).test(startNode.data.substr(0,range.startOffset));
+        } else if (includeLineBreaks && wysihtml5.dom.domNode(startNode).is.lineBreak()) {
+          return true;
         } else {
           r.selectNodeContents(this.getRange().commonAncestorContainer);
           r.collapse(true);
@@ -12143,6 +12319,11 @@ wysihtml5.quirks.ensureProperClearing = (function() {
           startOffset = (sel.isBackwards()) ? sel.focusOffset : sel.anchorOffset,
           rng = this.createRange(), endNode, inTmpCaret;
 
+      // If start is textnode and all is whitespace before caret. Set start offset to 0
+      if (startNode && startNode.nodeType === 3 && (/^\s*$/).test(startNode.data.slice(0, startOffset))) {
+        startOffset = 0;
+      }
+
       // Escape temproray helper nodes if selection in them
       inTmpCaret = wysihtml5.dom.getParentElement(startNode, { query: '._wysihtml5-temp-caret-fix' }, 1);
       if (inTmpCaret) {
@@ -12323,7 +12504,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
           node = this.doc.createElement('DIV'),
           fragment = this.doc.createDocumentFragment(),
           lastChild, lastEditorElement;
-
+      
       if (range) {
         range.deleteContents();
         node.innerHTML = html;
@@ -12333,7 +12514,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
           fragment.appendChild(node.firstChild);
         }
         range.insertNode(fragment);
-
+        
         lastEditorElement = this.contain.lastChild;
         while (lastEditorElement && lastEditorElement.nodeType === 3 && lastEditorElement.previousSibling && (/^\s*$/).test(lastEditorElement.data)) {
           lastEditorElement = lastEditorElement.previousSibling;
@@ -12462,43 +12643,6 @@ wysihtml5.quirks.ensureProperClearing = (function() {
       return nodes;
     },
 
-    deblockAndSurround: function(nodeOptions) {
-      var tempElement = this.doc.createElement('div'),
-          range = rangy.createRange(this.doc),
-          tempDivElements,
-          tempElements,
-          firstChild;
-
-      tempElement.className = nodeOptions.className;
-
-      this.composer.commands.exec("formatBlock", nodeOptions);
-      tempDivElements = this.contain.querySelectorAll("." + nodeOptions.className);
-      if (tempDivElements[0]) {
-        tempDivElements[0].parentNode.insertBefore(tempElement, tempDivElements[0]);
-
-        range.setStartBefore(tempDivElements[0]);
-        range.setEndAfter(tempDivElements[tempDivElements.length - 1]);
-        tempElements = range.extractContents();
-
-        while (tempElements.firstChild) {
-          firstChild = tempElements.firstChild;
-          if (firstChild.nodeType == 1 && wysihtml5.dom.hasClass(firstChild, nodeOptions.className)) {
-            while (firstChild.firstChild) {
-              tempElement.appendChild(firstChild.firstChild);
-            }
-            if (firstChild.nodeName !== "BR") { tempElement.appendChild(this.doc.createElement('br')); }
-            tempElements.removeChild(firstChild);
-          } else {
-            tempElement.appendChild(firstChild);
-          }
-        }
-      } else {
-        tempElement = null;
-      }
-
-      return tempElement;
-    },
-
     /**
      * Scroll the current caret position into the view
      * FIXME: This is a bit hacky, there might be a smarter way of doing this
@@ -12532,15 +12676,39 @@ wysihtml5.quirks.ensureProperClearing = (function() {
      * Select line where the caret is in
      */
     selectLine: function() {
+      var r = rangy.createRange();
       if (wysihtml5.browser.supportsSelectionModify()) {
         this._selectLine_W3C();
-      } else if (this.doc.selection) {
-        this._selectLine_MSIE();
-      } else {
+      } else if (r.nativeRange && r.nativeRange.getBoundingClientRect) {
         // For IE Edge as it ditched the old api and did not fully implement the new one (as expected)
         this._selectLineUniversal();
       }
     },
+    
+    includeRangyRangeHelpers: function() {
+      var s = this.getSelection(),
+          r = s.getRangeAt(0),
+          isHelperNode = function(node) {
+            return (node && node.nodeType === 1 && node.classList.contains('rangySelectionBoundary'));
+          },
+          getNodeLength = function (node) {
+            if (node.nodeType === 1) {
+              return node.childNodes && node.childNodes.length || 0;
+            } else {
+              return node.data && node.data.length || 0;
+            }
+          },
+          anode = s.anchorNode.nodeType === 1 ? s.anchorNode.childNodes[s.anchorOffset] : s.anchorNode,
+          fnode = s.focusNode.nodeType === 1 ? s.focusNode.childNodes[s.focusOffset] : s.focusNode;
+      
+      if (fnode && s.focusOffset === getNodeLength(fnode) && fnode.nextSibling && isHelperNode(fnode.nextSibling)) {
+        r.setEndAfter(fnode.nextSibling);
+      }
+      if (anode && s.anchorOffset === 0 && anode.previousSibling && isHelperNode(anode.previousSibling)) {
+        r.setStartBefore(anode.previousSibling);
+      }
+      r.select();
+    },
 
     /**
      * See https://developer.mozilla.org/en/DOM/Selection/modify
@@ -12548,10 +12716,10 @@ wysihtml5.quirks.ensureProperClearing = (function() {
     _selectLine_W3C: function() {
       var selection = this.win.getSelection(),
           initialBoundry = [selection.anchorNode, selection.anchorOffset, selection.focusNode, selection.focusOffset];
-
+          
       selection.modify("move", "left", "lineboundary");
       selection.modify("extend", "right", "lineboundary");
-
+      
       // IF lineboundary extending did not change selection try universal fallback (FF fails sometimes without a reason)
       if (selection.anchorNode === initialBoundry[0] &&
           selection.anchorOffset === initialBoundry[1] &&
@@ -12559,6 +12727,8 @@ wysihtml5.quirks.ensureProperClearing = (function() {
           selection.focusOffset === initialBoundry[3]
       ) {
         this._selectLineUniversal();
+      } else {
+        this.includeRangyRangeHelpers();
       }
     },
 
@@ -12610,89 +12780,88 @@ wysihtml5.quirks.ensureProperClearing = (function() {
           rect,
           startRange, endRange, testRange,
           count = 0,
-          amount, testRect, found;
+          amount, testRect, found,
+          that = this,
+          isLineBreakingElement = function(el) {
+            return el && el.nodeType === 1 && (that.win.getComputedStyle(el).display === "block" || wysihtml5.lang.array(['BR', 'HR']).contains(el.nodeName));
+          },
+          prevNode = function(node) {
+            var pnode = node;
+            if (pnode) {
+              while (pnode && ((pnode.nodeType === 1 && pnode.classList.contains('rangySelectionBoundary')) || (pnode.nodeType === 3 && (/^\s*$/).test(pnode.data)))) {
+                pnode = pnode.previousSibling;
+              }
+            }
+            return pnode;
+          };
 
       startRange = r.cloneRange();
       endRange = r.cloneRange();
 
       if (r.collapsed) {
-        r.expand('word', 1);
-        rect = r.nativeRange.getBoundingClientRect();
+        // Collapsed state can not have a bounding rect. Thus need to expand it at least by 1 character first while not crossing line boundary
+        // TODO: figure out a shorter and more readable way
+        if (r.startContainer.nodeType === 3 && r.startOffset < r.startContainer.data.length) {
+          r.moveEnd('character', 1);
+        } else if (r.startContainer.nodeType === 1 && r.startContainer.childNodes[r.startOffset] && r.startContainer.childNodes[r.startOffset].nodeType === 3 && r.startContainer.childNodes[r.startOffset].data.length > 0) {
+          r.moveEnd('character', 1);
+        } else if (
+          r.startOffset > 0 &&
+          (
+            r.startContainer.nodeType === 3 ||
+            (
+              r.startContainer.nodeType === 1 &&
+              !isLineBreakingElement(prevNode(r.startContainer.childNodes[r.startOffset - 1]))
+            )
+          )
+        ) {
+          r.moveStart('character', -1);
+        }
       }
-
+      if (!r.collapsed) {
+        r.insertNode(this.doc.createTextNode(wysihtml5.INVISIBLE_SPACE));
+      }
+      
+      // Is probably just empty line as can not be expanded
+      rect = r.nativeRange.getBoundingClientRect();
+      // If startnode is not line break allready move the start position of range by -1 character until clientRect top changes;
       do {
         amount = r.moveStart('character', -1);
         testRect =  r.nativeRange.getBoundingClientRect();
+        
         if (!testRect || Math.floor(testRect.top) !== Math.floor(rect.top)) {
           r.moveStart('character', 1);
           found = true;
         }
         count++;
       } while (amount !== 0 && !found && count < 2000);
-
       count = 0;
       found = false;
       rect = r.nativeRange.getBoundingClientRect();
-      do {
-        amount = r.moveEnd('character', 1);
-        testRect =  r.nativeRange.getBoundingClientRect();
-        if (!testRect || Math.floor(testRect.bottom) !== Math.floor(rect.bottom)) {
-          r.moveEnd('character', -1);
-          found = true;
-        }
-        count++;
-      } while (amount !== 0 && !found && count < 2000);
-
-      r.select();
-    },
-
-    _selectLine_MSIE: function() {
-      var range       = this.doc.selection && this.doc.selection.createRange ? this.doc.selection.createRange() : this.doc.createRange(),
-          rangeTop    = range.boundingTop,
-          scrollWidth = this.doc.body.scrollWidth,
-          rangeBottom,
-          rangeEnd,
-          measureNode,
-          i,
-          j;
-
-      window.r = range;
-
-      if (!range.moveToPoint) {
-        return;
-      }
-
-      if (rangeTop === 0) {
-        // Don't know why, but when the selection ends at the end of a line
-        // range.boundingTop is 0
-        measureNode = this.doc.createElement("span");
-        this.insertNode(measureNode);
-        rangeTop = measureNode.offsetTop;
-        measureNode.parentNode.removeChild(measureNode);
-      }
-
-      rangeTop += 1;
-
-      for (i=-10; i<scrollWidth; i+=2) {
-        try {
-          range.moveToPoint(i, rangeTop);
-          break;
-        } catch(e1) {}
-      }
-
-      // Investigate the following in order to handle multi line selections
-      // rangeBottom = rangeTop + (rangeHeight ? (rangeHeight - 1) : 0);
-      rangeBottom = rangeTop;
-      rangeEnd = this.doc.selection.createRange();
-      for (j=scrollWidth; j>=0; j--) {
-        try {
-          rangeEnd.moveToPoint(j, rangeBottom);
-          break;
-        } catch(e2) {}
+      
+      if (r.endContainer !== this.contain || (this.contain.lastChild && this.contain.childNodes[r.endOffset] !== this.contain.lastChild)) {
+        do {
+          amount = r.moveEnd('character', 1);
+          testRect =  r.nativeRange.getBoundingClientRect();
+          if (!testRect || Math.floor(testRect.bottom) !== Math.floor(rect.bottom)) {
+            r.moveEnd('character', -1);
+
+            // Fix a IE line end marked by linebreak element although caret is before it
+            // If causes problems should be changed to be applied only to IE
+            if (r.endContainer && r.endContainer.nodeType === 1 && r.endContainer.childNodes[r.endOffset] && r.endContainer.childNodes[r.endOffset].nodeType === 1 && r.endContainer.childNodes[r.endOffset].nodeName === "BR" && r.endContainer.childNodes[r.endOffset].previousSibling) {
+              if (r.endContainer.childNodes[r.endOffset].previousSibling.nodeType === 1) {
+                r.setEnd(r.endContainer.childNodes[r.endOffset].previousSibling, r.endContainer.childNodes[r.endOffset].previousSibling.childNodes.length);
+              } else if (r.endContainer.childNodes[r.endOffset].previousSibling.nodeType === 3) {
+                r.setEnd(r.endContainer.childNodes[r.endOffset].previousSibling, r.endContainer.childNodes[r.endOffset].previousSibling.data.length);
+              }
+            }
+            found = true;
+          }
+          count++;
+        } while (amount !== 0 && !found && count < 2000);
       }
-
-      range.setEndPoint("EndToEnd", rangeEnd);
-      range.select();
+      r.select();
+      this.includeRangyRangeHelpers();
     },
 
     getText: function() {
@@ -12863,7 +13032,7 @@ wysihtml5.quirks.ensureProperClearing = (function() {
 
       wysihtml5.dom.removeInvisibleSpaces(this.composer.element);
       doSelect();
-
+      
       if (this.composer.element.firstChild && notSelected())  {
         // Try fixing end
         this.composer.element.appendChild(blankEndNode);
@@ -12872,11 +13041,11 @@ wysihtml5.quirks.ensureProperClearing = (function() {
         if (notSelected()) {
           // Remove end fix
           blankEndNode.parentNode.removeChild(blankEndNode);
-
+          
           // Try fixing beginning
           this.composer.element.insertBefore(blankStartNode, this.composer.element.firstChild);
           doSelect();
-
+          
           if (notSelected()) {
             // Try fixing both
             this.composer.element.appendChild(blankEndNode);
@@ -13654,7 +13823,7 @@ wysihtml5.Commands = Base.extend(
         result  = null;
 
     // If composer ahs placeholder unset it before command
-    // Do not apply on commands that are behavioral
+    // Do not apply on commands that are behavioral 
     if (this.composer.hasPlaceholderSet() && !wysihtml5.lang.array(['styleWithCSS', 'enableObjectResizing', 'enableInlineTableEditing']).contains(command)) {
       this.composer.element.innerHTML = "";
       this.composer.selection.selectNode(this.composer.element);
@@ -13727,12 +13896,12 @@ wysihtml5.Commands = Base.extend(
   }
 });
 ;(function(wysihtml5) {
-
+  
   var nodeOptions = {
     nodeName: "B",
     toggle: true
   };
-
+  
   wysihtml5.commands.bold = {
     exec: function(composer, command) {
       wysihtml5.commands.formatInline.exec(composer, command, nodeOptions);
@@ -13971,9 +14140,9 @@ wysihtml5.Commands = Base.extend(
   };
 })(wysihtml5);
 ;/* Formatblock
- * Is used to insert block level elements
+ * Is used to insert block level elements 
  * It tries to solve the case that some block elements should not contain other block level elements (h1-6, p, ...)
- *
+ * 
 */
 (function(wysihtml5) {
 
@@ -13993,18 +14162,56 @@ wysihtml5.Commands = Base.extend(
     };
   }
 
+  function getRangeNode(node, offset) {
+    if (node.nodeType === 3) {
+      return node;
+    } else {
+      return node.childNodes[offset] || node;
+    }
+  }
+
+  // Returns if node is a line break
+  function isBr(n) {
+    return n && n.nodeType === 1 && n.nodeName === "BR";
+  }
+
+  // Is block level element
+  function isBlock(n, composer) {
+    return n && n.nodeType === 1 && composer.win.getComputedStyle(n).display === "block";
+  }
+
+  // Returns if node is the rangy selection bookmark element (that must not be taken into account in most situatons and is removed on selection restoring)
+  function isBookmark(n) {
+    return n && n.nodeType === 1 && n.classList.contains('rangySelectionBoundary');
+  }
+
+  // Is line breaking node
+  function isLineBreaking(n, composer) {
+    return isBr(n) || isBlock(n, composer);
+  }
+
   // Removes empty block level elements
-  function cleanup(composer) {
+  function cleanup(composer, newBlockElements) {
+    wysihtml5.dom.removeInvisibleSpaces(composer.element);
     var container = composer.element,
         allElements = container.querySelectorAll(BLOCK_ELEMENTS),
-        uneditables = container.querySelectorAll(composer.config.classNames.uneditableContainer),
-        elements = wysihtml5.lang.array(allElements).without(uneditables);
+        noEditQuery = composer.config.classNames.uneditableContainer + ([""]).concat(BLOCK_ELEMENTS.split(',')).join(", " + composer.config.classNames.uneditableContainer + ' '),
+        uneditables = container.querySelectorAll(noEditQuery),
+        elements = wysihtml5.lang.array(allElements).without(uneditables), // Lets not touch uneditable elements and their contents
+        nbIdx;
 
     for (var i = elements.length; i--;) {
-      if (elements[i].innerHTML.replace(/[\uFEFF]/g, '') === "") {
+      if (elements[i].innerHTML.replace(/[\uFEFF]/g, '') === "" && (newBlockElements.length === 0 || elements[i] !== newBlockElements[newBlockElements.length - 1])) {
+        // If cleanup removes some new block elements. remove them from newblocks array too
+        nbIdx = wysihtml5.lang.array(newBlockElements).indexOf(elements[i]);
+        if (nbIdx > -1) {
+          newBlockElements.splice(nbIdx, 1);
+        }
         elements[i].parentNode.removeChild(elements[i]);
       }
     }
+    
+    return newBlockElements;
   }
 
   function defaultNodeName(composer) {
@@ -14015,7 +14222,7 @@ wysihtml5.Commands = Base.extend(
   function findOuterBlock(node, container, allBlocks) {
     var n = node,
         block = null;
-
+        
     while (n && container && n !== container) {
       if (n.nodeType === 1 && n.matches(allBlocks ? BLOCK_ELEMENTS : UNNESTABLE_BLOCK_ELEMENTS)) {
         block = n;
@@ -14026,6 +14233,8 @@ wysihtml5.Commands = Base.extend(
     return block;
   }
 
+  // Clone for splitting the inner inline element out of its parent inline elements context
+  // For example if selection is in bold and italic, clone the outer nodes and wrap these around content and return
   function cloneOuterInlines(node, container) {
     var n = node,
         innerNode,
@@ -14088,7 +14297,10 @@ wysihtml5.Commands = Base.extend(
   // Unsets element properties by options
   // If nodename given and matches current element, element is unwrapped or converted to default node (depending on presence of class and style attributes)
   function removeOptionsFromElement(element, options, composer) {
-    var style, classes;
+    var style, classes,
+        prevNode = element.previousSibling,
+        nextNode = element.nextSibling,
+        unwrapped = false;
 
     if (options.styleProperty) {
       element.style[wysihtml5.browser.fixStyleKey(options.styleProperty)] = '';
@@ -14106,10 +14318,11 @@ wysihtml5.Commands = Base.extend(
       element.removeAttribute('class');
     }
 
-    if (options.nodeName && element.nodeName === options.nodeName) {
+    if (options.nodeName && element.nodeName.toLowerCase() === options.nodeName.toLowerCase()) {
       style = element.getAttribute('style');
       if (!style || style.trim() === '') {
         dom.unwrap(element);
+        unwrapped = true;
       } else {
         element = dom.renameElement(element, defaultNodeName(composer));
       }
@@ -14119,60 +14332,79 @@ wysihtml5.Commands = Base.extend(
     if (element.getAttribute('style') !== null && element.getAttribute('style').trim() === "") {
       element.removeAttribute('style');
     }
+
+    if (unwrapped) {
+      applySurroundingLineBreaks(prevNode, nextNode, composer);
+    }
   }
 
   // Unwraps block level elements from inside content
   // Useful as not all block level elements can contain other block-levels
   function unwrapBlocksFromContent(element) {
-    var contentBlocks = element.querySelectorAll(BLOCK_ELEMENTS) || []; // Find unnestable block elements in extracted contents
+    var blocks = element.querySelectorAll(BLOCK_ELEMENTS) || [], // Find unnestable block elements in extracted contents
+        nextEl, prevEl;
 
-    for (var i = contentBlocks.length; i--;) {
-      if (!contentBlocks[i].nextSibling || contentBlocks[i].nextSibling.nodeType !== 1 || contentBlocks[i].nextSibling.nodeName !== 'BR') {
-        if ((contentBlocks[i].innerHTML || contentBlocks[i].nodeValue || '').trim() !== '') {
-          contentBlocks[i].parentNode.insertBefore(contentBlocks[i].ownerDocument.createElement('BR'), contentBlocks[i].nextSibling);
+    for (var i = blocks.length; i--;) {
+      nextEl = wysihtml5.dom.domNode(blocks[i]).next({nodeTypes: [1,3], ignoreBlankTexts: true}),
+      prevEl = wysihtml5.dom.domNode(blocks[i]).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+      
+      if (nextEl && nextEl.nodeType !== 1 && nextEl.nodeName !== 'BR') {
+        if ((blocks[i].innerHTML || blocks[i].nodeValue || '').trim() !== '') {
+          blocks[i].parentNode.insertBefore(blocks[i].ownerDocument.createElement('BR'), nextEl);
         }
       }
-      wysihtml5.dom.unwrap(contentBlocks[i]);
+      if (nextEl && nextEl.nodeType !== 1 && nextEl.nodeName !== 'BR') {
+        if ((blocks[i].innerHTML || blocks[i].nodeValue || '').trim() !== '') {
+          blocks[i].parentNode.insertBefore(blocks[i].ownerDocument.createElement('BR'), nextEl);
+        }
+      }
+      wysihtml5.dom.unwrap(blocks[i]);
     }
   }
 
   // Fix ranges that visually cover whole block element to actually cover the block
   function fixRangeCoverage(range, composer) {
-    var node;
+    var node,
+        start = range.startContainer,
+        end = range.endContainer;
 
-    if (range.startContainer && range.startContainer.nodeType === 1 && range.startContainer === range.endContainer) {
-      if (range.startContainer.firstChild === range.startContainer.lastChild && range.endOffset === 1) {
-        if (range.startContainer !== composer.element) {
-          range.setStartBefore(range.startContainer);
-          range.setEndAfter(range.endContainer);
+    // If range has only one childNode and it is end to end the range, extend the range to contain the container element too
+    // This ensures the wrapper node is modified and optios added to it
+    if (start && start.nodeType === 1 && start === end) {
+      if (start.firstChild === start.lastChild && range.endOffset === 1) {
+        if (start !== composer.element && start.nodeName !== 'LI' && start.nodeName !== 'TD') {
+          range.setStartBefore(start);
+          range.setEndAfter(end);
         }
       }
       return;
     }
 
-    if (range.startContainer && range.startContainer.nodeType === 1 && range.endContainer.nodeType === 3) {
-      if (range.startContainer.firstChild === range.endContainer && range.endOffset === 1) {
-        if (range.startContainer !== composer.element) {
-          range.setEndAfter(range.startContainer);
+    // If range starts outside of node and ends inside at textrange and covers the whole node visually, extend end to cover the node end too
+    if (start && start.nodeType === 1 && end.nodeType === 3) {
+      if (start.firstChild === end && range.endOffset === end.data.length) {
+        if (start !== composer.element && start.nodeName !== 'LI' && start.nodeName !== 'TD') {
+          range.setEndAfter(start);
         }
       }
       return;
     }
-
-    if (range.endContainer && range.endContainer.nodeType === 1 && range.startContainer.nodeType === 3) {
-      if (range.endContainer.firstChild === range.startContainer && range.endOffset === 1) {
-        if (range.endContainer !== composer.element) {
-          range.setStartBefore(range.endContainer);
+    
+    // If range ends outside of node and starts inside at textrange and covers the whole node visually, extend start to cover the node start too
+    if (end && end.nodeType === 1 && start.nodeType === 3) {
+      if (end.firstChild === start && range.startOffset === 0) {
+        if (end !== composer.element && end.nodeName !== 'LI' && end.nodeName !== 'TD') {
+          range.setStartBefore(end);
         }
       }
       return;
     }
 
-
-    if (range.startContainer && range.startContainer.nodeType === 3 && range.startContainer === range.endContainer && range.startContainer.parentNode) {
-      if (range.startContainer.parentNode.firstChild === range.startContainer && range.endOffset == range.endContainer.length && range.startOffset === 0) {
-        node = range.startContainer.parentNode;
-        if (node !== composer.element) {
+    // If range covers a whole textnode and the textnode is the only child of node, extend range to node 
+    if (start && start.nodeType === 3 && start === end && start.parentNode.childNodes.length === 1) {
+      if (range.endOffset == end.data.length && range.startOffset === 0) {
+        node = start.parentNode;
+        if (node !== composer.element && node.nodeName !== 'LI' && node.nodeName !== 'TD') {
           range.setStartBefore(node);
           range.setEndAfter(node);
         }
@@ -14180,94 +14412,123 @@ wysihtml5.Commands = Base.extend(
       return;
     }
   }
-
-  // Wrap the range with a block level element
-  // If element is one of unnestable block elements (ex: h2 inside h1), split nodes and insert between so nesting does not occur
-  function wrapRangeWithElement(range, options, defaultName, composer) {
-    var defaultOptions = (options) ? wysihtml5.lang.object(options).clone(true) : null;
-    if (defaultOptions) {
-      defaultOptions.nodeName = defaultOptions.nodeName || defaultName || defaultNodeName(composer);
-    }
-    fixRangeCoverage(range, composer);
-
-    var r = range.cloneRange(),
-        rangeStartContainer = r.startContainer,
-        content = r.extractContents(),
-        fragment = composer.doc.createDocumentFragment(),
-        similarOptions = defaultOptions ? correctOptionsForSimilarityCheck(defaultOptions) : null,
-        similarOuterBlock = similarOptions ? wysihtml5.dom.getParentElement(rangeStartContainer, similarOptions, null, composer.element) : null,
-        splitAllBlocks = !defaultOptions || (defaultName === "BLOCKQUOTE" && defaultOptions.nodeName && defaultOptions.nodeName === "BLOCKQUOTE"),
-        firstOuterBlock = similarOuterBlock || findOuterBlock(rangeStartContainer, composer.element, splitAllBlocks), // The outermost un-nestable block element parent of selection start
-        wrapper, blocks, children;
-
-    if (options && options.nodeName && options.nodeName === "BLOCKQUOTE") {
-      var tmpEl = applyOptionsToElement(null, options, composer);
-      tmpEl.appendChild(content);
-      fragment.appendChild(tmpEl);
-      blocks = [tmpEl];
-    } else {
-
-      if (!content.firstChild) {
-        fragment.appendChild(applyOptionsToElement(null, options, composer));
+  
+  // Scans ranges array for insertion points that are not allowed to insert block tags fixes/splits illegal ranges
+  // Some places do not allow block level elements inbetween (inside ul and outside li)
+  // TODO: might need extending for other nodes besides li (maybe dd,dl,dt)
+  function fixNotPermittedInsertionPoints(ranges) {
+    var newRanges = [],
+        lis, j, maxj, tmpRange, rangePos, closestLI;
+        
+    for (var i = 0, maxi = ranges.length; i < maxi; i++) {
+      
+      // Fixes range start and end positions if inside UL or OL element (outside of LI)
+      if (ranges[i].startContainer.nodeType === 1 && ranges[i].startContainer.matches('ul, ol')) {
+        ranges[i].setStart(ranges[i].startContainer.childNodes[ranges[i].startOffset], 0);
+      }
+      if (ranges[i].endContainer.nodeType === 1 && ranges[i].endContainer.matches('ul, ol')) {
+        closestLI = ranges[i].endContainer.childNodes[Math.max(ranges[i].endOffset - 1, 0)];
+        if (closestLI.childNodes) {
+          ranges[i].setEnd(closestLI, closestLI.childNodes.length);
+        }
+      }
+
+      // Get all LI eleemnts in selection (fully or partially covered)
+      // And make sure ranges are either inside LI or outside UL/OL
+      // Split and add new ranges as needed to cover same range content
+      // TODO: Needs improvement to accept DL, DD, DT
+      lis = ranges[i].getNodes([1], function(node) {
+        return node.nodeName === "LI";
+      });
+      if (lis.length > 0) {
+      
+        for (j = 0, maxj = lis.length; j < maxj; j++) {
+          rangePos = ranges[i].compareNode(lis[j]);
+
+          // Fixes start of range that crosses LI border
+          if (rangePos === ranges[i].NODE_AFTER || rangePos === ranges[i].NODE_INSIDE) {
+            // Range starts before and ends inside the node
+
+            tmpRange = ranges[i].cloneRange();
+            closestLI = wysihtml5.dom.domNode(lis[j]).prev({nodeTypes: [1]});
+            
+            if (closestLI) {
+              tmpRange.setEnd(closestLI, closestLI.childNodes.length);
+            } else if (lis[j].closest('ul, ol')) {
+              tmpRange.setEndBefore(lis[j].closest('ul, ol'));
+            } else {
+              tmpRange.setEndBefore(lis[j]);
+            }
+            newRanges.push(tmpRange);
+            ranges[i].setStart(lis[j], 0);
+          }
+          
+          // Fixes end of range that crosses li border
+          if (rangePos === ranges[i].NODE_BEFORE || rangePos === ranges[i].NODE_INSIDE) {
+            // Range starts inside the node and ends after node
+            
+            tmpRange = ranges[i].cloneRange();
+            tmpRange.setEnd(lis[j], lis[j].childNodes.length);
+            newRanges.push(tmpRange);
+            
+            // Find next LI in list and if present set range to it, else 
+            closestLI = wysihtml5.dom.domNode(lis[j]).next({nodeTypes: [1]});
+            if (closestLI) {
+              ranges[i].setStart(closestLI, 0);
+            } else if (lis[j].closest('ul, ol')) {
+              ranges[i].setStartAfter(lis[j].closest('ul, ol'));
+            } else {
+              ranges[i].setStartAfter(lis[j]);
+            } 
+          }
+        }
+        newRanges.push(ranges[i]);
       } else {
+        newRanges.push(ranges[i]);
+      }
+    }
+    return newRanges;
+  }
+  
+  // Return options object with nodeName set if original did not have any
+  // Node name is set to local or global default
+  function getOptionsWithNodename(options, defaultName, composer) {
+    var correctedOptions = (options) ? wysihtml5.lang.object(options).clone(true) : null;
+    if (correctedOptions) {  
+      correctedOptions.nodeName = correctedOptions.nodeName || defaultName || defaultNodeName(composer);
+    }
+    return correctedOptions;
+  }
+  
+  // Injects document fragment to range ensuring outer elements are split to a place where block elements are allowed to be inserted
+  // Also wraps empty clones of split parent tags around fragment to keep formatting
+  // If firstOuterBlock is given assume that instead of finding outer (useful for solving cases of some blocks are allowed into others while others are not)
+  function injectFragmentToRange(fragment, range, composer, firstOuterBlock) {
+    var rangeStartContainer = range.startContainer,
+        firstOuterBlock = firstOuterBlock || findOuterBlock(rangeStartContainer, composer.element, true),
+        outerInlines, first, last, prev, next;
+    
+    if (firstOuterBlock) {
+      // If selection starts inside un-nestable block, split-escape the unnestable point and insert node between
+      first = fragment.firstChild;
+      last = fragment.lastChild;
 
-        while(content.firstChild) {
+      composer.selection.splitElementAtCaret(firstOuterBlock, fragment);
 
-          if (content.firstChild.nodeType == 1 && content.firstChild.matches(BLOCK_ELEMENTS)) {
+      next = wysihtml5.dom.domNode(last).next({nodeTypes: [1,3], ignoreBlankTexts: true});
+      prev = wysihtml5.dom.domNode(first).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
 
-            if (options) {
-              // Escape(split) block formatting at caret
-              applyOptionsToElement(content.firstChild, options, composer);
-              if (content.firstChild.matches(UNNESTABLE_BLOCK_ELEMENTS)) {
-                unwrapBlocksFromContent(content.firstChild);
-              }
-              fragment.appendChild(content.firstChild);
+      if (first && !isLineBreaking(first, composer) && prev && !isLineBreaking(prev, composer)) {
+        first.parentNode.insertBefore(composer.doc.createElement('br'), first);
+      }
 
-            } else {
-              // Split block formating and add new block to wrap caret
-              unwrapBlocksFromContent(content.firstChild);
-              children = wysihtml5.dom.unwrap(content.firstChild);
-              for (var c = 0, cmax = children.length; c < cmax; c++) {
-                fragment.appendChild(children[c]);
-              }
+      if (last && !isLineBreaking(last, composer) && next && !isLineBreaking(next, composer)) {
+        next.parentNode.insertBefore(composer.doc.createElement('br'), next);
+      }
 
-              if (fragment.childNodes.length > 0) {
-                fragment.appendChild(composer.doc.createElement('BR'));
-              }
-            }
-          } else {
-
-            if (options) {
-              // Wrap subsequent non-block nodes inside new block element
-              wrapper = applyOptionsToElement(null, defaultOptions, composer);
-              while(content.firstChild && (content.firstChild.nodeType !== 1 || !content.firstChild.matches(BLOCK_ELEMENTS))) {
-                if (content.firstChild.nodeType == 1 && wrapper.matches(UNNESTABLE_BLOCK_ELEMENTS)) {
-                  unwrapBlocksFromContent(content.firstChild);
-                }
-                wrapper.appendChild(content.firstChild);
-              }
-              fragment.appendChild(wrapper);
-
-            } else {
-              // Escape(split) block formatting at selection
-              if (content.firstChild.nodeType == 1) {
-                unwrapBlocksFromContent(content.firstChild);
-              }
-              fragment.appendChild(content.firstChild);
-            }
-
-          }
-        }
-      }
-
-      blocks = wysihtml5.lang.array(fragment.childNodes).get();
-    }
-    if (firstOuterBlock) {
-      // If selection starts inside un-nestable block, split-escape the unnestable point and insert node between
-      composer.selection.splitElementAtCaret(firstOuterBlock, fragment);
     } else {
       // Ensure node does not get inserted into an inline where it is not allowed
-      var outerInlines = cloneOuterInlines(rangeStartContainer, composer.element);
+      outerInlines = cloneOuterInlines(rangeStartContainer, composer.element);
       if (outerInlines.outerNode && outerInlines.innerNode && outerInlines.parent) {
         if (fragment.childNodes.length === 1) {
           while(fragment.firstChild.firstChild) {
@@ -14277,11 +14538,228 @@ wysihtml5.Commands = Base.extend(
         }
         composer.selection.splitElementAtCaret(outerInlines.parent, fragment);
       } else {
-        // Otherwise just insert
-        r.insertNode(fragment);
+        var fc = fragment.firstChild,
+            lc = fragment.lastChild;
+
+        range.insertNode(fragment);
+        // restore range position as it might get lost in webkit sometimes
+        range.setStartBefore(fc);
+        range.setEndAfter(lc);
+      }
+    }
+  }
+  
+  // Removes all block formatting from range
+  function clearRangeBlockFromating(range, closestBlockName, composer) {
+    var r = range.cloneRange(),
+        prevNode = getRangeNode(r.startContainer, r.startOffset).previousSibling,
+        nextNode = getRangeNode(r.endContainer, r.endOffset).nextSibling,
+        content = r.extractContents(),
+        fragment = composer.doc.createDocumentFragment(),
+        children, blocks,
+        first = true;
+        
+    while(content.firstChild) {
+      // Iterate over all selection content first level childNodes
+      if (content.firstChild.nodeType === 1 && content.firstChild.matches(BLOCK_ELEMENTS)) {
+        // If node is a block element
+        // Split block formating and add new block to wrap caret
+        
+        unwrapBlocksFromContent(content.firstChild);
+        children = wysihtml5.dom.unwrap(content.firstChild);
+        
+        // Add line break before if needed
+        if (children.length > 0) {
+          if (
+            (fragment.lastChild && (fragment.lastChild.nodeType !== 1 || !isLineBreaking(fragment.lastChild, composer))) ||
+            (!fragment.lastChild && prevNode && (prevNode.nodeType !== 1 || isLineBreaking(prevNode, composer)))
+          ){
+            fragment.appendChild(composer.doc.createElement('BR'));
+          }
+        }
+        
+        for (var c = 0, cmax = children.length; c < cmax; c++) {
+          fragment.appendChild(children[c]);
+        }
+        
+        // Add line break after if needed
+        if (children.length > 0) {
+          if (fragment.lastChild.nodeType !== 1 || !isLineBreaking(fragment.lastChild, composer)) {
+            if (nextNode || fragment.lastChild !== content.lastChild) {
+              fragment.appendChild(composer.doc.createElement('BR'));
+            }
+          }
+        }
+        
+      } else {
+        fragment.appendChild(content.firstChild);
+      }
+      
+      first = false;
+    }
+    blocks = wysihtml5.lang.array(fragment.childNodes).get();
+    injectFragmentToRange(fragment, r, composer);
+    return blocks;
+  }
+  
+  // When block node is inserted, look surrounding nodes and remove surplous linebreak tags (as block format breaks line itself)
+  function removeSurroundingLineBreaks(prevNode, nextNode, composer) {
+    var prevPrev = prevNode && wysihtml5.dom.domNode(prevNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+    if (isBr(nextNode)) {
+      nextNode.parentNode.removeChild(nextNode);
+    }
+    if (isBr(prevNode) && (!prevPrev || prevPrev.nodeType !== 1 || composer.win.getComputedStyle(prevPrev).display !== "block")) {
+      prevNode.parentNode.removeChild(prevNode);
+    }
+  }
+
+  function applySurroundingLineBreaks(prevNode, nextNode, composer) {
+    var prevPrev;
+
+    if (prevNode && isBookmark(prevNode)) {
+      prevNode = prevNode.previousSibling;
+    }
+    if (nextNode && isBookmark(nextNode)) {
+      nextNode = nextNode.nextSibling;
+    }
+
+    prevPrev = prevNode && prevNode.previousSibling;
+
+    if (prevNode && (prevNode.nodeType !== 1 || (composer.win.getComputedStyle(prevNode).display !== "block" && !isBr(prevNode))) && prevNode.parentNode) {
+      prevNode.parentNode.insertBefore(composer.doc.createElement('br'), prevNode.nextSibling);
+    }
+
+    if (nextNode && (nextNode.nodeType !== 1 || composer.win.getComputedStyle(nextNode).display !== "block") && nextNode.parentNode) {
+      nextNode.parentNode.insertBefore(composer.doc.createElement('br'), nextNode);
+    }
+  }
+
+  var isWhitespaceBefore = function (textNode, offset) {
+    var str = textNode.data ? textNode.data.slice(0, offset) : "";
+    return (/^\s*$/).test(str);
+  }
+
+  var isWhitespaceAfter = function (textNode, offset) {
+    var str = textNode.data ? textNode.data.slice(offset) : "";
+    return (/^\s*$/).test(str);
+  }
+
+  var trimBlankTextsAndBreaks = function(fragment) {
+    if (fragment) {
+      while (fragment.firstChild && fragment.firstChild.nodeType === 3 && (/^\s*$/).test(fragment.firstChild.data) && fragment.lastChild !== fragment.firstChild) {
+        fragment.removeChild(fragment.firstChild);
+      }
+
+      while (fragment.lastChild && fragment.lastChild.nodeType === 3 && (/^\s*$/).test(fragment.lastChild.data) && fragment.lastChild !== fragment.firstChild) {
+        fragment.removeChild(fragment.lastChild);
+      }
+
+      if (fragment.firstChild && fragment.firstChild.nodeType === 1 && fragment.firstChild.nodeName === "BR" && fragment.lastChild !== fragment.firstChild) {
+        fragment.removeChild(fragment.firstChild);
       }
+
+      if (fragment.lastChild && fragment.lastChild.nodeType === 1 && fragment.lastChild.nodeName === "BR" && fragment.lastChild !== fragment.firstChild) {
+        fragment.removeChild(fragment.lastChild);
+      }
+    }
+  }
+
+  // Wrap the range with a block level element
+  // If element is one of unnestable block elements (ex: h2 inside h1), split nodes and insert between so nesting does not occur
+  function wrapRangeWithElement(range, options, closestBlockName, composer) {
+    var similarOptions = options ? correctOptionsForSimilarityCheck(options) : null,
+        r = range.cloneRange(),
+        rangeStartContainer = r.startContainer,
+        startNode = getRangeNode(r.startContainer, r.startOffset),
+        endNode = getRangeNode(r.endContainer, r.endOffset),
+        prevNode = (r.startContainer === startNode && startNode.nodeType === 3 && !isWhitespaceBefore(startNode, r.startOffset)) ? startNode :  wysihtml5.dom.domNode(startNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true}),
+        nextNode = (
+          (
+            r.endContainer.nodeType === 1 &&
+            r.endContainer.childNodes[r.endOffset] === endNode &&
+            (
+              endNode.nodeType === 1 ||
+              !isWhitespaceAfter(endNode, r.endOffset) &&
+              !wysihtml5.dom.domNode(endNode).is.rangyBookmark()
+            )
+          ) || (
+            r.endContainer === endNode &&
+            endNode.nodeType === 3 &&
+            !isWhitespaceAfter(endNode, r.endOffset)
+          )
+        ) ? endNode : wysihtml5.dom.domNode(endNode).next({nodeTypes: [1,3], ignoreBlankTexts: true}),
+        content = r.extractContents(),
+        fragment = composer.doc.createDocumentFragment(),
+        similarOuterBlock = similarOptions ? wysihtml5.dom.getParentElement(rangeStartContainer, similarOptions, null, composer.element) : null,
+        splitAllBlocks = !closestBlockName || !options || (options.nodeName === "BLOCKQUOTE" && closestBlockName === "BLOCKQUOTE"),
+        firstOuterBlock = similarOuterBlock || findOuterBlock(rangeStartContainer, composer.element, splitAllBlocks), // The outermost un-nestable block element parent of selection start
+        wrapper, blocks, children,
+        firstc, lastC;
+
+    if (wysihtml5.dom.domNode(nextNode).is.rangyBookmark()) {
+      endNode = nextNode;
+      nextNode = endNode.nextSibling;
     }
 
+    trimBlankTextsAndBreaks(content);
+
+    if (options && options.nodeName === "BLOCKQUOTE") {
+      
+      // If blockquote is to be inserted no quessing just add it as outermost block on line or selection
+      var tmpEl = applyOptionsToElement(null, options, composer);
+      tmpEl.appendChild(content);
+      fragment.appendChild(tmpEl);
+      blocks = [tmpEl];
+      
+    } else {
+
+      if (!content.firstChild) {
+        // IF selection is caret (can happen if line is empty) add format around tag 
+        fragment.appendChild(applyOptionsToElement(null, options, composer));
+      } else {
+
+        while(content.firstChild) {
+          // Iterate over all selection content first level childNodes
+          
+          if (content.firstChild.nodeType == 1 && content.firstChild.matches(BLOCK_ELEMENTS)) {
+            
+            // If node is a block element
+            // Escape(split) block formatting at caret
+            applyOptionsToElement(content.firstChild, options, composer);
+            if (content.firstChild.matches(UNNESTABLE_BLOCK_ELEMENTS)) {
+              unwrapBlocksFromContent(content.firstChild);
+            }
+            fragment.appendChild(content.firstChild);
+            
+          } else {
+            
+            // Wrap subsequent non-block nodes inside new block element
+            wrapper = applyOptionsToElement(null, getOptionsWithNodename(options, closestBlockName, composer), composer);
+            while(content.firstChild && (content.firstChild.nodeType !== 1 || !content.firstChild.matches(BLOCK_ELEMENTS))) {
+              if (content.firstChild.nodeType == 1 && wrapper.matches(UNNESTABLE_BLOCK_ELEMENTS)) {
+                unwrapBlocksFromContent(content.firstChild);
+              }
+              wrapper.appendChild(content.firstChild);
+            }
+            fragment.appendChild(wrapper);
+          }
+        }
+      }
+
+      blocks = wysihtml5.lang.array(fragment.childNodes).get();
+    }
+    injectFragmentToRange(fragment, r, composer, firstOuterBlock);
+    removeSurroundingLineBreaks(prevNode, nextNode, composer);
+
+    // Fix webkit madness by inserting linebreak rangy after cursor marker to blank last block
+    // (if it contains rangy bookmark, so selection can be restored later correctly)
+    if (blocks.length > 0 &&
+      (
+        typeof blocks[blocks.length - 1].lastChild === "undefined" || wysihtml5.dom.domNode(blocks[blocks.length - 1].lastChild).is.rangyBookmark()
+      )
+    ) {
+      blocks[blocks.length - 1].appendChild(composer.doc.createElement('br'));
+    }
     return blocks;
   }
 
@@ -14293,101 +14771,181 @@ wysihtml5.Commands = Base.extend(
 
     return (parentNode) ? parentNode.nodeName : null;
   }
+  
+  // Expands caret to cover the closest block that:
+  //   * cannot contain other block level elements (h1-6,p, etc)
+  //   * Has the same nodeName that is to be inserted
+  //   * has insertingNodeName
+  //   * is DIV if insertingNodeName is not present
+  //
+  // If nothing found selects the current line
+  function expandCaretToBlock(composer, insertingNodeName) {
+    var parent = wysihtml5.dom.getParentElement(composer.selection.getOwnRanges()[0].startContainer, {
+          query: UNNESTABLE_BLOCK_ELEMENTS + ', ' + (insertingNodeName ? insertingNodeName.toLowerCase() : 'div'),
+        }, null, composer.element),
+        range;
+
+    if (parent) {
+      range = composer.selection.createRange();
+      range.selectNode(parent);
+      composer.selection.setSelection(range);
+    } else if (!composer.isEmpty()) {
+      composer.selection.selectLine();
+    }
+  }
+  
+  // Set selection to begin inside first created block element (beginning of it) and end inside (and after content) of last block element
+  // TODO: Checking nodetype might be unnescescary as nodes inserted by formatBlock are nodetype 1 anyway
+  function selectElements(newBlockElements, composer) {
+    var range = composer.selection.createRange(),
+        lastEl = newBlockElements[newBlockElements.length - 1],
+        lastOffset = (lastEl.nodeType === 1 && lastEl.childNodes) ? lastEl.childNodes.length | 0 :  lastEl.length || 0;
+
+    range.setStart(newBlockElements[0], 0);
+    range.setEnd(lastEl, lastOffset);
+    range.select();
+  }
+  
+  // Get all ranges from selection (takes out uneditables and out of editor parts) and apply format to each
+  // Return created/modified block level elements 
+  // Method can be either "apply" or "remove"
+  function formatSelection(method, composer, options) {
+    var ranges = composer.selection.getOwnRanges(),
+        newBlockElements = [],
+        closestBlockName;
+        
+    // Some places do not allow block level elements inbetween (inside ul and outside li, inside table and outside of td/th)
+    ranges = fixNotPermittedInsertionPoints(ranges);
+        
+    for (var i = ranges.length; i--;) {
+      fixRangeCoverage(ranges[i], composer);
+      closestBlockName = getParentBlockNodeName(ranges[i].startContainer, composer);
+      if (method === "remove") {
+        newBlockElements = newBlockElements.concat(clearRangeBlockFromating(ranges[i], closestBlockName, composer));
+      } else {
+        newBlockElements = newBlockElements.concat(wrapRangeWithElement(ranges[i], options, closestBlockName, composer));
+      }
+    }
+    return newBlockElements;
+  }
+  
+  // If properties is passed as a string, look for tag with that tagName/query 
+  function parseOptions(options) {
+    if (typeof options === "string") {
+      options = {
+        nodeName: options.toUpperCase()
+      };
+    }
+    return options;
+  }
+
+  function caretIsOnEmptyLine(composer) {
+    var caretInfo;
+    if (composer.selection.isCollapsed()) {
+      caretInfo = composer.selection.getNodesNearCaret();
+      if (caretInfo && caretInfo.caretNode) {
+        if (
+          // caret is allready breaknode
+          wysihtml5.dom.domNode(caretInfo.caretNode).is.lineBreak() ||
+          // caret is textnode
+          (caretInfo.caretNode.nodeType === 3 && caretInfo.textOffset === 0 && (!caretInfo.prevNode || wysihtml5.dom.domNode(caretInfo.prevNode).is.lineBreak())) ||
+          // Caret is temprorary rangy selection marker
+          (caretInfo.caretNode.nodeType === 1 && caretInfo.caretNode.classList.contains('rangySelectionBoundary') &&
+            (!caretInfo.prevNode || wysihtml5.dom.domNode(caretInfo.prevNode).is.lineBreak() || wysihtml5.dom.domNode(caretInfo.prevNode).is.block()) &&
+            (!caretInfo.nextNode || wysihtml5.dom.domNode(caretInfo.nextNode).is.lineBreak() || wysihtml5.dom.domNode(caretInfo.nextNode).is.block())
+          )
+        ) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
 
   wysihtml5.commands.formatBlock = {
     exec: function(composer, command, options) {
+      options = parseOptions(options);
       var newBlockElements = [],
-          placeholder, ranges, range, parent, bookmark, state;
-
-      // If properties is passed as a string, look for tag with that tagName/query
-      if (typeof options === "string") {
-        options = {
-          nodeName: options.toUpperCase()
-        };
-      }
+          ranges, range, bookmark, state, closestBlockName;
 
-      // Remove state if toggle set and state on and selection is collapsed
+      // Find if current format state is active if options.toggle is set as true
+      // In toggle case active state elemets are formatted instead of working directly on selection
       if (options && options.toggle) {
         state = this.state(composer, command, options);
-        if (state) {
-          bookmark = rangy.saveSelection(composer.win);
-          for (var j = 0, jmax = state.length; j < jmax; j++) {
-            removeOptionsFromElement(state[j], options, composer);
-          }
-        }
       }
+      if (state) {
+        // Remove format from state nodes if toggle set and state on and selection is collapsed
+        bookmark = rangy.saveSelection(composer.win);
+        for (var j = 0, jmax = state.length; j < jmax; j++) {
+          removeOptionsFromElement(state[j], options, composer);
+        }
 
-      // Otherwise expand selection so it will cover closest block if option caretSelectsBlock is true and selection is collapsed
-      if (!state) {
-
+      } else {
+        // If selection is caret expand it to cover nearest suitable block element or row if none found
         if (composer.selection.isCollapsed()) {
-          parent = wysihtml5.dom.getParentElement(composer.selection.getOwnRanges()[0].startContainer, {
-            query: UNNESTABLE_BLOCK_ELEMENTS + ', ' + (options && options.nodeName ? options.nodeName.toLowerCase() : 'div'),
-          }, null, composer.element);
-          if (parent) {
-            bookmark = rangy.saveSelection(composer.win);
-            range = composer.selection.createRange();
-            range.selectNode(parent);
-            composer.selection.setSelection(range);
-          } else if (!composer.isEmpty()) {
-            bookmark = rangy.saveSelection(composer.win);
+          bookmark = rangy.saveSelection(composer.win);
+          if (caretIsOnEmptyLine(composer)) {
             composer.selection.selectLine();
+          } else {
+            expandCaretToBlock(composer, options && options.nodeName ? options.nodeName.toUpperCase() : undefined);
           }
         }
-
-        // And get all selection ranges of current composer and iterate
-        ranges = composer.selection.getOwnRanges();
-        for (var i = ranges.length; i--;) {
-          newBlockElements = newBlockElements.concat(wrapRangeWithElement(ranges[i], options, getParentBlockNodeName(ranges[i].startContainer, composer), composer));
+        if (options) {
+          newBlockElements = formatSelection("apply", composer, options);
+        } else {
+          // Options == null means block formatting should be removed from selection
+          newBlockElements = formatSelection("remove", composer);
         }
-
+        
       }
 
       // Remove empty block elements that may be left behind
-      cleanup(composer);
-      // If cleanup removed some new block elements. remove them from array too
-      for (var e = newBlockElements.length; e--;) {
-        if (!newBlockElements[e].parentNode) {
-          newBlockElements.splice(e, 1);
-        }
+      // Also remove them from new blocks list
+      newBlockElements = cleanup(composer, newBlockElements);
+      
+      // Restore selection
+      if (bookmark) {
+        rangy.restoreSelection(bookmark);
+      } else {
+        selectElements(newBlockElements, composer);
       }
-
-      // Restore correct selection
+    },
+    
+    // Removes all block formatting from selection
+    remove: function(composer, command, options) {
+      options = parseOptions(options);
+      var newBlockElements, bookmark;
+      
+      // If selection is caret expand it to cover nearest suitable block element or row if none found
+      if (composer.selection.isCollapsed()) {
+        bookmark = rangy.saveSelection(composer.win);
+        expandCaretToBlock(composer, options && options.nodeName ? options.nodeName.toUpperCase() : undefined);
+      }
+      
+      newBlockElements = formatSelection("remove", composer);
+      newBlockElements = cleanup(composer, newBlockElements);
+      
+      // Restore selection
       if (bookmark) {
-        wysihtml5.dom.removeInvisibleSpaces(composer.element);
         rangy.restoreSelection(bookmark);
       } else {
-        wysihtml5.dom.removeInvisibleSpaces(composer.element);
-        // Set selection to beging inside first created block element (beginning of it) and end inside (and after content) of last block element
-        // TODO: Checking nodetype might be unnescescary as nodes inserted by formatBlock are nodetype 1 anyway
-        range = composer.selection.createRange();
-        range.setStart(newBlockElements[0], 0);
-        var lastEl = newBlockElements[newBlockElements.length - 1],
-            lastOffset = (lastEl.nodeType === 1 && lastEl.childNodes) ? lastEl.childNodes.length | 0 :  lastEl.length || 0;
-        range.setEnd(lastEl, lastOffset);
-        range.select();
+        selectElements(newBlockElements, composer);
       }
     },
 
-    // If properties as null is passed returns status describing all block level elements
-    state: function(composer, command, properties) {
-
-      // If properties is passed as a string, look for tag with that tagName/query
-      if (typeof properties === "string") {
-        properties = {
-          query: properties
-        };
-      }
+    // If options as null is passed returns status describing all block level elements
+    state: function(composer, command, options) {
+      options = parseOptions(options);
 
       var nodes = composer.selection.filterElements((function (element) { // Finds matching elements inside selection
-            return wysihtml5.dom.domNode(element).test(properties || { query: BLOCK_ELEMENTS });
+            return wysihtml5.dom.domNode(element).test(options || { query: BLOCK_ELEMENTS });
           }).bind(this)),
           parentNodes = composer.selection.getSelectedOwnNodes(),
           parent;
 
       // Finds matching elements that are parents of selection and adds to nodes list
       for (var i = 0, maxi = parentNodes.length; i < maxi; i++) {
-        parent = dom.getParentElement(parentNodes[i], properties || { query: BLOCK_ELEMENTS }, null, composer.element);
+        parent = dom.getParentElement(parentNodes[i], options || { query: BLOCK_ELEMENTS }, null, composer.element);
         if (parent && nodes.indexOf(parent) === -1) {
           nodes.push(parent);
         }
@@ -14559,7 +15117,7 @@ wysihtml5.Commands = Base.extend(
   }
 
   // If attrbutes and values are the same > remove
-  // if attributes or values
+  // if attributes or values 
   function updateElementAttributes(element, newAttributes, toggle) {
     var attr = wysihtml5.dom.getAttributes(element),
         fullContain = containsSameAttributes(newAttributes, attr),
@@ -14597,6 +15155,9 @@ wysihtml5.Commands = Base.extend(
       if (options.toggle !== false && element.classList.contains(options.className)) {
         element.classList.remove(options.className);
       } else {
+        if (options.classRegExp) {
+          element.className = element.className.replace(options.classRegExp, '');
+        }
         element.classList.add(options.className);
       }
       if (hasNoClass(element)) {
@@ -14630,7 +15191,7 @@ wysihtml5.Commands = Base.extend(
     // Handle similar semantically same elements (queryAliasMap)
     nodeNameQuery = options.nodeName ? queryAliasMap[options.nodeName.toLowerCase()] || options.nodeName.toLowerCase() : null;
     nodeQueryMatch = nodeNameQuery ? wysihtml5.dom.domNode(element).test({ query: nodeNameQuery }) : false;
-
+    
     // Unwrap element if no attributes present and node name given
     // or no attributes and if no nodename set but node is the default
     if (!options.nodeName || options.nodeName === defaultTag || nodeQueryMatch) {
@@ -14703,7 +15264,7 @@ wysihtml5.Commands = Base.extend(
         selection = rangy.getSelection(composer.win);
 
     rangy.getSelection(composer.win).removeAllRanges();
-
+    
     // IE looses focus of contenteditable on removeallranges and can not set new selection unless contenteditable is focused again
     try {
       rangy.getSelection(composer.win).addRange(range);
@@ -14725,7 +15286,7 @@ wysihtml5.Commands = Base.extend(
       range.setEnd(lastText, lastText.length);
       selectRange(composer, range);
     }
-
+    
   }
 
   function selectTextNode(composer, node, start, end) {
@@ -14777,7 +15338,7 @@ wysihtml5.Commands = Base.extend(
       }
 
     }
-
+    
     return {
       nodes: nodes,
       partial: partial
@@ -14801,7 +15362,7 @@ wysihtml5.Commands = Base.extend(
   }
 
   // Returns a range and textnode containing object from caret position covering a whole word
-  // wordOffsety describes the original position of caret in the new textNode
+  // wordOffsety describes the original position of caret in the new textNode 
   // Caret has to be inside a textNode.
   function getRangeForWord(selection) {
     var anchor, offset, doc, range, offsetStart, offsetEnd, beforeChar, afterChar,
@@ -14849,7 +15410,7 @@ wysihtml5.Commands = Base.extend(
 
   function mergeConsequentSimilarElements(elements) {
     for (var i = elements.length; i--;) {
-
+      
       if (elements[i] && elements[i].parentNode) { // Test if node is not allready removed in cleanup
 
         if (elements[i].nextSibling && isSameNode(elements[i], elements[i].nextSibling)) {
@@ -14933,7 +15494,7 @@ wysihtml5.Commands = Base.extend(
       if (options.toggle !== false) {
         if (caretIsInsideWord(selection)) {
 
-          // Unformat whole word
+          // Unformat whole word 
           wordObj = getRangeForWord(selection);
           textNode = wordObj.textNode;
           unformatTextNode(wordObj.textNode, composer, options);
@@ -14975,13 +15536,13 @@ wysihtml5.Commands = Base.extend(
         }
 
       } else {
-
+        
         // Selection is partially in format
         // change it to new if format if textnode allreafy in similar state
         // else just apply
-
+        
         for (i = textNodes.length; i--;) {
-
+          
           if (findSimilarTextNodeWrapper(textNodes[i], options, composer.element)) {
             unformatTextNode(textNodes[i], composer, options);
           }
@@ -15002,7 +15563,7 @@ wysihtml5.Commands = Base.extend(
     var textNode, textOffset, newNode, i,
         selection = composer.selection.getSelection();
 
-    if (!textNodes.length) {
+    if (!textNodes.length) {    
       textNode = selection.anchorNode;
       textOffset = selection.anchorOffset;
 
@@ -15023,7 +15584,7 @@ wysihtml5.Commands = Base.extend(
   function applyFormat(composer, textNodes, options) {
     var wordObj, i,
         selection = composer.selection.getSelection();
-
+ 
     if (!textNodes.length) {
       // Handle collapsed selection caret and return
       if (caretIsInsideWord(selection)) {
@@ -15038,7 +15599,7 @@ wysihtml5.Commands = Base.extend(
           formatTextRange(r, composer, options);
         }
       }
-
+      
     } else {
       // Handle textnodes in selection and apply format
       for (i = textNodes.length; i--;) {
@@ -15047,7 +15608,7 @@ wysihtml5.Commands = Base.extend(
       cleanupAndSetSelection(composer, textNodes, options);
     }
   }
-
+  
   // If properties is passed as a string, correct options with that nodeName
   function fixOptions(options) {
     options = (typeof options === "string") ? { nodeName: options } : options;
@@ -15090,7 +15651,7 @@ wysihtml5.Commands = Base.extend(
         // Text allready has the format applied
         removeFormat(composer, textNodes, state, options);
       }
-
+      
       composer.element.normalize();
     },
 
@@ -15347,7 +15908,9 @@ wysihtml5.Commands = Base.extend(
         for (var i = innerLists.length; i--;) {
           wysihtml5.dom.resolveList(innerLists[i], composer.config.useLineBreaks);
         }
-        wysihtml5.dom.resolveList(el, composer.config.useLineBreaks);
+        if (innerLists.length === 0) {
+          wysihtml5.dom.resolveList(el, composer.config.useLineBreaks);
+        }
       }
     });
   };
@@ -15383,20 +15946,19 @@ wysihtml5.Commands = Base.extend(
   };
 
   var createListFallback = function(nodeName, composer) {
-    var sel;
-
-    if (!composer.selection.isCollapsed()) {
-      sel = rangy.saveSelection(composer.win);
-    }
+    var sel = rangy.saveSelection(composer.win);
 
     // Fallback for Create list
     var tempClassName =  "_wysihtml5-temp-" + new Date().getTime(),
-        tempElement = composer.selection.deblockAndSurround({
-          "nodeName": "div",
-          "className": tempClassName
-        }),
         isEmpty, list;
 
+    composer.commands.exec("formatBlock", {
+      "nodeName": "div",
+      "className": tempClassName
+    });
+
+    var tempElement = composer.element.querySelector("." + tempClassName);
+
     // This space causes new lists to never break on enter
     var INVISIBLE_SPACE_REG_EXP = /\uFEFF/g;
     tempElement.innerHTML = tempElement.innerHTML.replace(wysihtml5.INVISIBLE_SPACE_REG_EXP, "");
@@ -15416,8 +15978,34 @@ wysihtml5.Commands = Base.extend(
     exec: function(composer, command, nodeName) {
       var doc           = composer.doc,
           cmd           = (nodeName === "OL") ? "insertOrderedList" : "insertUnorderedList",
-          selectedNode  = composer.selection.getSelectedNode(),
-          list          = findListEl(selectedNode, nodeName, composer);
+          s = composer.selection.getSelection(),
+          anode = s.anchorNode.nodeType === 1 && s.anchorNode.firstChild ? s.anchorNode.childNodes[s.anchorOffset] : s.anchorNode,
+          fnode = s.focusNode.nodeType === 1 && s.focusNode.firstChild ? s.focusNode.childNodes[s.focusOffset] || s.focusNode.lastChild : s.focusNode,
+          selectedNode, list;
+
+      if (s.isBackwards()) {
+        // swap variables
+        anode = [fnode, fnode = anode][0];
+      }
+
+      if (wysihtml5.dom.domNode(fnode).is.emptyTextNode(true) && fnode) {
+        fnode = wysihtml5.dom.domNode(fnode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+      }
+      if (wysihtml5.dom.domNode(anode).is.emptyTextNode(true) && anode) {
+        anode = wysihtml5.dom.domNode(anode).next({nodeTypes: [1,3], ignoreBlankTexts: true});
+      }
+
+      if (anode && fnode) {
+        if (anode === fnode) {
+          selectedNode = anode;
+        } else {
+          selectedNode = wysihtml5.dom.domNode(anode).commonAncestor(fnode, composer.element);
+        }
+      } else {
+        selectedNode  = composer.selection.getSelectedNode();
+      }
+
+      list = findListEl(selectedNode, nodeName, composer);
 
       if (!list.el) {
         if (composer.commands.support(cmd)) {
@@ -15442,7 +16030,7 @@ wysihtml5.Commands = Base.extend(
 
 })(wysihtml5);
 ;(function(wysihtml5){
-
+  
   var nodeOptions = {
     nodeName: "I",
     toggle: true
@@ -15476,7 +16064,7 @@ wysihtml5.Commands = Base.extend(
       return wysihtml5.commands.formatBlock.state(composer, "formatBlock", nodeOptions);
     }
   };
-
+  
 })(wysihtml5);
 ;(function(wysihtml5) {
 
@@ -15533,7 +16121,7 @@ wysihtml5.Commands = Base.extend(
   };
 })(wysihtml5);
 ;(function(wysihtml5) {
-
+  
   var nodeOptions = {
     styleProperty: "textAlign",
     styleValue: "right",
@@ -15897,7 +16485,7 @@ wysihtml5.Commands = Base.extend(
   };
 }(wysihtml5));
 ;(function(wysihtml5){
-
+  
   var nodeOptions = {
     nodeName: "SUB",
     toggle: true
@@ -16247,7 +16835,7 @@ wysihtml5.views.View = Base.extend(
 
     cleanUp: function(rules) {
       var bookmark;
-      if (this.selection) {
+      if (this.selection && this.selection.isInThisEditable()) {
         bookmark = rangy.saveSelection(this.win);
       }
       this.parent.parse(this.element, undefined, rules);
@@ -16419,6 +17007,8 @@ wysihtml5.views.View = Base.extend(
           ]).from(this.textarea.element).to(this.element);
       }
 
+      this._initAutoLinking();
+
       dom.addClass(this.element, this.config.classNames.composer);
       //
       // Make the editor look like the original textarea, by syncing styles
@@ -16451,7 +17041,6 @@ wysihtml5.views.View = Base.extend(
       // Make sure that the browser avoids using inline styles whenever possible
       this.commands.exec("styleWithCSS", false);
 
-      this._initAutoLinking();
       this._initObjectResizing();
       this._initUndoManager();
       this._initLineBreaking();
@@ -16485,10 +17074,7 @@ wysihtml5.views.View = Base.extend(
           supportsAutoLinking            = browser.doesAutoLinkingInContentEditable();
 
       if (supportsDisablingOfAutoLinking) {
-        // I have no idea why IE edge deletes element content here when calling the command,
-        var tmpHTML = this.element.innerHTML;
         this.commands.exec("AutoUrlDetect", false, false);
-        this.element.innerHTML = tmpHTML;
       }
 
       if (!this.config.autoLink) {
@@ -16612,8 +17198,11 @@ wysihtml5.views.View = Base.extend(
       function adjust(selectedNode) {
         var parentElement = dom.getParentElement(selectedNode, { query: "p, div" }, 2);
         if (parentElement && dom.contains(that.element, parentElement)) {
-          that.selection.executeAndRestore(function() {
+          that.selection.executeAndRestoreRangy(function() {
             if (that.config.useLineBreaks) {
+              if (!parentElement.firstChild || (parentElement.firstChild === parentElement.lastChild && parentElement.firstChild.nodeType === 1 && parentElement.firstChild.classList.contains('rangySelectionBoundary'))) {
+                parentElement.appendChild(that.doc.createElement('br'));
+              }
               dom.replaceWithChildNodes(parentElement);
             } else if (parentElement.nodeName !== "P") {
               dom.renameElement(parentElement, "p");
@@ -16622,59 +17211,63 @@ wysihtml5.views.View = Base.extend(
         }
       }
 
+      // Ensures when editor is empty and not line breaks mode, the inital state has a paragraph in it on focus with caret inside paragraph
       if (!this.config.useLineBreaks) {
-        dom.observe(this.element, ["focus", "keydown"], function() {
+        dom.observe(this.element, ["focus"], function() {
           if (that.isEmpty()) {
-            var paragraph = that.doc.createElement("P");
-            that.element.innerHTML = "";
-            that.element.appendChild(paragraph);
-            if (!browser.displaysCaretInEmptyContentEditableCorrectly()) {
-              paragraph.innerHTML = "<br>";
-              that.selection.setBefore(paragraph.firstChild);
-            } else {
-              that.selection.selectNode(paragraph, true);
-            }
+            setTimeout(function() {
+              var paragraph = that.doc.createElement("P");
+              that.element.innerHTML = "";
+              that.element.appendChild(paragraph);
+              if (!browser.displaysCaretInEmptyContentEditableCorrectly()) {
+                paragraph.innerHTML = "<br>";
+                that.selection.setBefore(paragraph.firstChild);
+              } else {
+                that.selection.selectNode(paragraph, true);
+              }
+            }, 0);
           }
         });
       }
+
       dom.observe(this.element, "keydown", function(event) {
         var keyCode = event.keyCode;
 
-        if (event.ctrlKey || event.defaultPrevented) {
+        if (event.shiftKey || event.ctrlKey || event.defaultPrevented) {
           return;
         }
 
         if (keyCode !== wysihtml5.ENTER_KEY && keyCode !== wysihtml5.BACKSPACE_KEY) {
           return;
         }
-        if (keyCode === wysihtml5.ENTER_KEY && (that.config.useLineBreaks || event.shiftKey) && !wysihtml5.browser.insertsLineBreaksOnReturn()) {
-          event.preventDefault();
-          that.commands.exec("insertLineBreak");
-        } else {
-          var blockElement = dom.getParentElement(that.selection.getSelectedNode(), { query: USE_NATIVE_LINE_BREAK_INSIDE_TAGS }, 4);
-          if (blockElement) {
-            setTimeout(function() {
-              // Unwrap paragraph after leaving a list or a H1-6
-              var selectedNode = that.selection.getSelectedNode(),
-              list;
-
-              if (blockElement.nodeName === "LI") {
-                if (!selectedNode) {
-                  return;
-                }
-
-                list = dom.getParentElement(selectedNode, { query: LIST_TAGS }, 2);
+        var blockElement = dom.getParentElement(that.selection.getSelectedNode(), { query: USE_NATIVE_LINE_BREAK_INSIDE_TAGS }, 4);
+        if (blockElement) {
+          setTimeout(function() {
+            // Unwrap paragraph after leaving a list or a H1-6
+            var selectedNode = that.selection.getSelectedNode(),
+                list;
 
-                if (!list) {
-                  adjust(selectedNode);
-                }
+            if (blockElement.nodeName === "LI") {
+              if (!selectedNode) {
+                return;
               }
 
-              if (keyCode === wysihtml5.ENTER_KEY && blockElement.nodeName.match(/^H[1-6]$/)) {
+              list = dom.getParentElement(selectedNode, { query: LIST_TAGS }, 2);
+
+              if (!list) {
                 adjust(selectedNode);
               }
-            }, 0);
-          }
+            }
+
+            if (keyCode === wysihtml5.ENTER_KEY && blockElement.nodeName.match(/^H[1-6]$/)) {
+              adjust(selectedNode);
+            }
+          }, 0);
+          return;
+        }
+        if (that.config.useLineBreaks && keyCode === wysihtml5.ENTER_KEY && !wysihtml5.browser.insertsLineBreaksOnReturn()) {
+          event.preventDefault();
+          that.commands.exec("insertLineBreak");
         }
       });
     }
@@ -16891,6 +17484,7 @@ wysihtml5.views.View = Base.extend(
  */
 (function(wysihtml5) {
   var dom       = wysihtml5.dom,
+      domNode = dom.domNode,
       browser   = wysihtml5.browser,
       /**
        * Map keyCodes to query commands
@@ -16900,95 +17494,253 @@ wysihtml5.views.View = Base.extend(
         "73": "italic",   // I
         "85": "underline" // U
       };
+      
+  var actions = {
 
-  // Adds multiple eventlisteners to target, bound to one callback
-  // TODO: If needed elsewhere make it part of wysihtml5.dom or sth
-  var addListeners = function (target, events, callback) {
-    for(var i = 0, max = events.length; i < max; i++) {
-      target.addEventListener(events[i], callback, false);
-    }
-  };
+    // Adds multiple eventlisteners to target, bound to one callback
+    // TODO: If needed elsewhere make it part of wysihtml5.dom or sth
+    addListeners: function (target, events, callback) {
+      for(var i = 0, max = events.length; i < max; i++) {
+        target.addEventListener(events[i], callback, false);
+      }
+    },
 
-  // Removes multiple eventlisteners from target, bound to one callback
-  // TODO: If needed elsewhere make it part of wysihtml5.dom or sth
-  var removeListeners = function (target, events, callback) {
-    for(var i = 0, max = events.length; i < max; i++) {
-      target.removeEventListener(events[i], callback, false);
-    }
-  };
+    // Removes multiple eventlisteners from target, bound to one callback
+    // TODO: If needed elsewhere make it part of wysihtml5.dom or sth
+    removeListeners: function (target, events, callback) {
+      for(var i = 0, max = events.length; i < max; i++) {
+        target.removeEventListener(events[i], callback, false);
+      }
+    },
 
-  // Override for giving user ability to delete last line break in table cell
-  var fixLastBrDeletionInTable = function(composer, force) {
-    if (composer.selection.caretIsLastInSelection()) {
-      var sel = composer.selection.getSelection(),
-          aNode = sel.anchorNode;
-      if (aNode && aNode.nodeType === 1 && (wysihtml5.dom.getParentElement(aNode, {query: 'td, th'}, false, composer.element) || force)) {
-        var nextNode = aNode.childNodes[sel.anchorOffset];
-        if (nextNode && nextNode.nodeType === 1 & nextNode.nodeName === "BR") {
-          nextNode.parentNode.removeChild(nextNode);
-          return true;
+    // Override for giving user ability to delete last line break in table cell
+    fixLastBrDeletionInTable: function(composer, force) {
+      if (composer.selection.caretIsLastInSelection()) {
+        var sel = composer.selection.getSelection(),
+            aNode = sel.anchorNode;
+        if (aNode && aNode.nodeType === 1 && (wysihtml5.dom.getParentElement(aNode, {query: 'td, th'}, false, composer.element) || force)) {
+          var nextNode = aNode.childNodes[sel.anchorOffset];
+          if (nextNode && nextNode.nodeType === 1 & nextNode.nodeName === "BR") {
+            nextNode.parentNode.removeChild(nextNode);
+            return true;
+          }
         }
       }
-    }
-    return false;
-  };
+      return false;
+    },
 
-  // If found an uneditable before caret then notify it before deletion
-  var handleUneditableDeletion = function(composer) {
-    var before = composer.selection.getBeforeSelection(true);
-    if (before && (before.type === "element" || before.type === "leafnode") && before.node.nodeType === 1 && before.node.classList.contains(composer.config.classNames.uneditableContainer)) {
-      if (fixLastBrDeletionInTable(composer, true)) {
+    // If found an uneditable before caret then notify it before deletion
+    handleUneditableDeletion: function(composer) {
+      var before = composer.selection.getBeforeSelection(true);
+      if (before && (before.type === "element" || before.type === "leafnode") && before.node.nodeType === 1 && before.node.classList.contains(composer.config.classNames.uneditableContainer)) {
+        if (actions.fixLastBrDeletionInTable(composer, true)) {
+          return true;
+        }
+        try {
+          var ev = new CustomEvent("wysihtml5:uneditable:delete", {bubbles: true, cancelable: false});
+          before.node.dispatchEvent(ev);
+        } catch (err) {}
+        before.node.parentNode.removeChild(before.node);
         return true;
       }
-      try {
-        var ev = new CustomEvent("wysihtml5:uneditable:delete");
-        before.node.dispatchEvent(ev);
-      } catch (err) {}
-      before.node.parentNode.removeChild(before.node);
-      return true;
-    }
-    return false;
-  };
+      return false;
+    },
 
-  // Deletion with caret in the beginning of headings needs special attention
-  // Heading does not concate text to previous block node correctly (browsers do unexpected miracles here especially webkit)
-  var fixDeleteInTheBeginnigOfHeading = function(composer) {
-    var selection = composer.selection,
-        prevNode = selection.getPreviousNode();
+    // Deletion with caret in the beginning of headings and other block elvel elements needs special attention
+    // Not allways does it concate text to previous block node correctly (browsers do unexpected miracles here especially webkit)
+    fixDeleteInTheBeginningOfBlock: function(composer) {
+      var selection = composer.selection,
+          prevNode = selection.getPreviousNode();
 
-    if (selection.caretIsFirstInSelection() &&
-        prevNode &&
-        prevNode.nodeType === 1 &&
-        (/block/).test(composer.win.getComputedStyle(prevNode).display)
-    ) {
-      if ((/^\s*$/).test(prevNode.textContent || prevNode.innerText)) {
-        // If heading is empty remove the heading node
-        prevNode.parentNode.removeChild(prevNode);
+      if (selection.caretIsFirstInSelection(wysihtml5.browser.usesControlRanges()) && prevNode) {
+        if (prevNode.nodeType === 1 &&
+            wysihtml5.dom.domNode(prevNode).is.block() &&
+            !domNode(prevNode).test({
+              query: "ol, ul, table, tr, dl"
+            })
+        ) {
+          if ((/^\s*$/).test(prevNode.textContent || prevNode.innerText)) {
+            // If heading is empty remove the heading node
+            prevNode.parentNode.removeChild(prevNode);
+            return true;
+          } else {
+            if (prevNode.lastChild) {
+              var selNode = prevNode.lastChild,
+                  selectedNode = selection.getSelectedNode(),
+                  commonAncestorNode = domNode(prevNode).commonAncestor(selectedNode, composer.element),
+                  curNode = wysihtml5.dom.getParentElement(selectedNode, {
+                    query: "h1, h2, h3, h4, h5, h6, p, pre, div, blockquote"
+                  }, false, commonAncestorNode || composer.element);
+
+              if (curNode) {
+                domNode(curNode).transferContentTo(prevNode, true);
+                selection.setAfter(selNode);
+                return true;
+              } else if (wysihtml5.browser.usesControlRanges()) {
+                selectedNode = selection.getCaretNode();
+                domNode(selectedNode).transferContentTo(prevNode, true);
+                selection.setAfter(selNode);
+                return true;
+              }
+            }
+          }
+        }
+      }
+      return false;
+    },
+
+    /* In IE when deleting with caret at the begining of LI, list gets broken into half instead of merging the LI with previous */
+    /* This does not match other browsers an is less intuitive from UI standpoint, thus has to be fixed */
+    fixDeleteInTheBeginningOfLi: function(composer) {
+      if (wysihtml5.browser.hasLiDeletingProblem()) {
+        var selection = composer.selection.getSelection(),
+            aNode = selection.anchorNode,
+            listNode, prevNode, firstNode,
+            isInBeginnig = composer.selection.caretIsFirstInSelection();
+
+        // Fix caret at the beginnig of first textNode in LI
+        if (aNode.nodeType === 3 && selection.anchorOffset === 0 && aNode === aNode.parentNode.firstChild) {
+          aNode = aNode.parentNode;
+          isInBeginnig = true;
+        }
+
+        if (isInBeginnig && aNode && aNode.nodeType === 1 && aNode.nodeName === "LI") {
+          prevNode = domNode(aNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+          if (!prevNode && aNode.parentNode && (aNode.parentNode.nodeName === "UL" || aNode.parentNode.nodeName === "OL")) {
+            prevNode = domNode(aNode.parentNode).prev({nodeTypes: [1,3], ignoreBlankTexts: true});
+          }
+          if (prevNode) {
+            firstNode = aNode.firstChild;
+            domNode(aNode).transferContentTo(prevNode, true);
+            if (firstNode) {
+              composer.selection.setBefore(firstNode);
+            } else if (prevNode) {
+              if (prevNode.nodeType === 1) {
+                if (prevNode.lastChild) {
+                  composer.selection.setAfter(prevNode.lastChild);
+                } else {
+                  composer.selection.selectNode(prevNode);
+                }
+              } else {
+                composer.selection.setAfter(prevNode);
+              }
+            }
+            return true;
+          }
+        }
+      }
+      return false;
+    },
+    
+    fixDeleteInTheBeginningOfControlSelection: function(composer) {
+      var selection = composer.selection,
+          prevNode = selection.getPreviousNode(),
+          selectedNode = selection.getSelectedNode(),
+          afterCaretNode;
+
+      if (selection.caretIsFirstInSelection()) {
+        if (selectedNode.nodeType === 3) {
+          selectedNode = selectedNode.parentNode;
+        }
+        afterCaretNode = selectedNode.firstChild;
+        domNode(selectedNode).transferContentTo(prevNode, true);
+        if (afterCaretNode) {
+          composer.selection.setBefore(afterCaretNode);
+        }
         return true;
-      } else {
-        if (prevNode.lastChild) {
-          var selNode = prevNode.lastChild,
-              selectedNode = selection.getSelectedNode(),
-              commonAncestorNode = wysihtml5.dom.domNode(prevNode).commonAncestor(selectedNode, composer.element);
-              curNode = commonAncestorNode ? wysihtml5.dom.getParentElement(selectedNode, {
-                query: "h1, h2, h3, h4, h5, h6, p, pre, div, blockquote"
-              }, false, commonAncestorNode) : null;
-
-            if (curNode) {
-              while (curNode.firstChild) {
-                prevNode.appendChild(curNode.firstChild);
+      }
+      return false;
+    },
+
+    // Table management
+    // If present enableObjectResizing and enableInlineTableEditing command should be called with false to prevent native table handlers
+    initTableHandling: function() {
+      var hideHandlers = function() {
+            window.removeEventListener('load', hideHandlers);
+            this.doc.execCommand("enableObjectResizing", false, "false");
+            this.doc.execCommand("enableInlineTableEditing", false, "false");
+          }.bind(this),
+          iframeInitiator = (function() {
+            hideHandlers.call(this);
+            actions.removeListeners(this.sandbox.getIframe(), ["focus", "mouseup", "mouseover"], iframeInitiator);
+          }).bind(this);
+
+      if( this.doc.execCommand &&
+          wysihtml5.browser.supportsCommand(this.doc, "enableObjectResizing") &&
+          wysihtml5.browser.supportsCommand(this.doc, "enableInlineTableEditing"))
+      {
+        if (this.sandbox.getIframe) {
+          actions.addListeners(this.sandbox.getIframe(), ["focus", "mouseup", "mouseover"], iframeInitiator);
+        } else {
+          window.addEventListener('load', hideHandlers);
+        }
+      }
+      this.tableSelection = wysihtml5.quirks.tableCellsSelection(this.element, this.parent);
+    },
+
+    // Fixes some misbehaviours of enters in linebreaks mode (natively a bit unsupported feature)
+    // Returns true if some corrections is applied so events know when to prevent default
+    doLineBreaksModeEnterWithCaret: function(composer) {
+      var breakNodes = "p, pre, div, blockquote",
+          caretInfo, parent, txtNode,
+          ret = false;
+
+      caretInfo = composer.selection.getNodesNearCaret();
+      if (caretInfo) {
+
+        if (caretInfo.caretNode || caretInfo.nextNode) {
+          parent = dom.getParentElement(caretInfo.caretNode || caretInfo.nextNode, { query: breakNodes }, 2);
+          if (parent === composer.element) {
+            parent = undefined;
+          }
+        }
+
+        if (parent && caretInfo.caretNode) {
+          if (domNode(caretInfo.caretNode).is.lineBreak()) {
+
+            if (composer.config.doubleLineBreakEscapesBlock) {
+              // Double enter (enter on blank line) exits block element in useLineBreaks mode.
+              ret = true;
+              caretInfo.caretNode.parentNode.removeChild(caretInfo.caretNode);
+
+              // Ensure surplous line breaks are not added to preceding element
+              if (domNode(caretInfo.nextNode).is.lineBreak()) {
+                caretInfo.nextNode.parentNode.removeChild(caretInfo.nextNode);
+              }
+
+              var brNode = composer.doc.createElement('br');
+              if (domNode(caretInfo.nextNode).is.lineBreak() && caretInfo.nextNode === parent.lastChild) {
+                parent.parentNode.insertBefore(brNode, parent.nextSibling);
+              } else {
+                composer.selection.splitElementAtCaret(parent, brNode);
               }
-              selection.setAfter(selNode);
-              return true;
-            } else if (selectedNode.nodeType === 3) {
-              prevNode.appendChild(selectedNode);
-              selection.setAfter(selNode);
-              return true;
+
+              // Ensure surplous blank lines are not added to preceding element
+              if (caretInfo.nextNode && caretInfo.nextNode.nodeType === 3) {
+                // Replaces blank lines at the beginning of textnode
+                caretInfo.nextNode.data = caretInfo.nextNode.data.replace(/^ *[\r\n]+/, '');
+              }
+              composer.selection.setBefore(brNode);
             }
+
+          } else if (caretInfo.caretNode.nodeType === 3 && wysihtml5.browser.hasCaretBlockElementIssue() && caretInfo.textOffset === caretInfo.caretNode.data.length && !caretInfo.nextNode) {
+
+            // This fixes annoying webkit issue when you press enter at the end of a block then seemingly nothing happens.
+            // in reality one line break is generated and cursor is reported after it, but when entering something cursor jumps before the br
+            ret = true;
+            var br1 = composer.doc.createElement('br'),
+                br2 = composer.doc.createElement('br'),
+                f = composer.doc.createDocumentFragment();
+            f.appendChild(br1);
+            f.appendChild(br2);
+            composer.selection.insertNode(f);
+            composer.selection.setBefore(br2);
+
+          }
         }
       }
+      return ret;
     }
-    return false;
   };
 
   var handleDeleteKeyPress = function(event, composer) {
@@ -16996,18 +17748,28 @@ wysihtml5.views.View = Base.extend(
         element = composer.element;
 
     if (selection.isCollapsed()) {
-      if (fixDeleteInTheBeginnigOfHeading(composer)) {
+      if (actions.handleUneditableDeletion(composer)) {
+        event.preventDefault();
+        return;
+      }
+      if (actions.fixDeleteInTheBeginningOfLi(composer)) {
         event.preventDefault();
         return;
       }
-      if (fixLastBrDeletionInTable(composer)) {
+      if (actions.fixDeleteInTheBeginningOfBlock(composer)) {
         event.preventDefault();
         return;
       }
-      if (handleUneditableDeletion(composer)) {
+      if (actions.fixLastBrDeletionInTable(composer)) {
         event.preventDefault();
         return;
       }
+      if (wysihtml5.browser.usesControlRanges()) {
+        if (actions.fixDeleteInTheBeginningOfControlSelection(composer)) {
+          event.preventDefault();
+          return;
+        }
+      }
     } else {
       if (selection.containsUneditable()) {
         event.preventDefault();
@@ -17016,6 +17778,21 @@ wysihtml5.views.View = Base.extend(
     }
   };
 
+  var handleEnterKeyPress = function(event, composer) {
+    if (composer.config.useLineBreaks && !event.shiftKey && !event.ctrlKey) {
+      // Fixes some misbehaviours of enters in linebreaks mode (natively a bit unsupported feature)
+
+      var breakNodes = "p, pre, div, blockquote",
+          caretInfo, parent, txtNode;
+
+      if (composer.selection.isCollapsed()) {
+        if (actions.doLineBreaksModeEnterWithCaret(composer)) {
+          event.preventDefault();
+        }
+      }
+    }
+  };
+
   var handleTabKeyDown = function(composer, element, shiftKey) {
     if (!composer.selection.isCollapsed()) {
       composer.selection.deleteContents();
@@ -17109,25 +17886,29 @@ wysihtml5.views.View = Base.extend(
         this.selection.selectNode(target);
       }
     }
-  };
-
-  // TODO: mouseover is not actually a foolproof and obvious place for this, must be changed as it modifies dom on random basis
-  // Shows url in tooltip when hovering links or images
-  var handleMouseOver = function(event) {
-    var titlePrefixes = {
-          IMG: "Image: ",
-          A:   "Link: "
-        },
-        target   = event.target,
-        nodeName = target.nodeName,
-        title;
 
-    if (nodeName !== "A" && nodeName !== "IMG") {
-      return;
+    // Saves mousedown position for IE controlSelect fix
+    if (wysihtml5.browser.usesControlRanges()) {
+      this.selection.lastMouseDownPos = {x: event.clientX, y: event.clientY};
+      setTimeout(function() {
+        delete this.selection.lastMouseDownPos;
+      }.bind(this), 0);
     }
-    if(!target.hasAttribute("title")){
-      title = titlePrefixes[nodeName] + (target.getAttribute("href") || target.getAttribute("src"));
-      target.setAttribute("title", title);
+  };
+
+  // IE has this madness of control selects of overflowed and some other elements (weird box around element on selection and second click selects text)
+  // This fix handles the second click problem by adding cursor to the right position under cursor inside when controlSelection is made
+  var handleIEControlSelect = function(event) {
+    var target = event.target,
+        pos = this.selection.lastMouseDownPos;
+    if (pos) {
+      var caretPosition = document.body.createTextRange();
+        setTimeout(function() {
+          try {
+            caretPosition.moveToPoint(pos.x, pos.y);
+            caretPosition.select();
+          } catch (e) {}
+        }.bind(this), 0);
     }
   };
 
@@ -17197,6 +17978,10 @@ wysihtml5.views.View = Base.extend(
       handleTabKeyDown(this, this.element, event.shiftKey);
     }
 
+    if (keyCode === wysihtml5.ENTER_KEY) {
+      handleEnterKeyPress(event, this);
+    }
+
   };
 
   var handleIframeFocus = function(event) {
@@ -17212,32 +17997,9 @@ wysihtml5.views.View = Base.extend(
       this.selection.getSelection().removeAllRanges();
     }).bind(this), 0);
   };
-
-  // Table management
-  // If present enableObjectResizing and enableInlineTableEditing command should be called with false to prevent native table handlers
-  var initTableHandling = function () {
-    var hideHandlers = function () {
-          window.removeEventListener('load', hideHandlers);
-          this.doc.execCommand("enableObjectResizing", false, "false");
-          this.doc.execCommand("enableInlineTableEditing", false, "false");
-        }.bind(this),
-        iframeInitiator = (function() {
-          hideHandlers.call(this);
-          removeListeners(this.sandbox.getIframe(), ["focus", "mouseup", "mouseover"], iframeInitiator);
-        }).bind(this);
-
-    if( this.doc.execCommand &&
-        wysihtml5.browser.supportsCommand(this.doc, "enableObjectResizing") &&
-        wysihtml5.browser.supportsCommand(this.doc, "enableInlineTableEditing"))
-    {
-      if (this.sandbox.getIframe) {
-        addListeners(this.sandbox.getIframe(), ["focus", "mouseup", "mouseover"], iframeInitiator);
-      } else {
-        window.addEventListener('load', hideHandlers);
-      }
-    }
-    this.tableSelection = wysihtml5.quirks.tableCellsSelection(this.element, this.parent);
-  };
+  
+  // Testing requires actions to be accessible from out of scope
+  wysihtml5.views.Composer.prototype.observeActions = actions;
 
   wysihtml5.views.Composer.prototype.observe = function() {
     var that                = this,
@@ -17248,7 +18010,19 @@ wysihtml5.views.View = Base.extend(
     this.focusState = this.getValue(false, false);
 
     // --------- destroy:composer event ---------
-    container.addEventListener(["DOMNodeRemoved"], handleDomNodeRemoved.bind(this), false);
+
+    // FIXME: (did) replace the deprecated DOMNodeRemoved event by a call to the MutationObserver
+    const handleRemovedNodes = function(records) {
+      for (const record of records) {
+        if (record.removedNodes.length > 0) {
+          if (record.removedNodes[0] === container) {
+            handleDomNodeRemoved.call(this)
+          }
+        }
+      }
+    }
+    const observer = new MutationObserver(handleRemovedNodes.bind(this));
+    observer.observe(container.parentNode, { childList: true });
 
     // DOMNodeRemoved event is not supported in IE 8
     // TODO: try to figure out a polyfill style fix, so it could be transferred to polyfills and removed if ie8 is not needed
@@ -17263,22 +18037,26 @@ wysihtml5.views.View = Base.extend(
     // --------- User interactions --
     if (this.config.handleTables) {
       // If handleTables option is true, table handling functions are bound
-      initTableHandling.call(this);
+      actions.initTableHandling.call(this);
     }
 
-    addListeners(focusBlurElement, ["drop", "paste", "mouseup", "focus", "keyup"], handleUserInteraction.bind(this));
+    actions.addListeners(focusBlurElement, ["drop", "paste", "mouseup", "focus", "keyup"], handleUserInteraction.bind(this));
     focusBlurElement.addEventListener("focus", handleFocus.bind(this), false);
     focusBlurElement.addEventListener("blur",  handleBlur.bind(this), false);
-
-    addListeners(this.element, ["drop", "paste", "beforepaste"], handlePaste.bind(this), false);
+    
+    actions.addListeners(this.element, ["drop", "paste", "beforepaste"], handlePaste.bind(this), false);
     this.element.addEventListener("copy",       handleCopy.bind(this), false);
     this.element.addEventListener("mousedown",  handleMouseDown.bind(this), false);
-    this.element.addEventListener("mouseover",  handleMouseOver.bind(this), false);
     this.element.addEventListener("click",      handleClick.bind(this), false);
     this.element.addEventListener("drop",       handleDrop.bind(this), false);
     this.element.addEventListener("keyup",      handleKeyUp.bind(this), false);
     this.element.addEventListener("keydown",    handleKeyDown.bind(this), false);
 
+    // IE controlselect madness fix
+    if (wysihtml5.browser.usesControlRanges()) {
+      this.element.addEventListener('mscontrolselect', handleIEControlSelect.bind(this), false);
+    }
+
     this.element.addEventListener("dragenter", (function() {
       this.parent.fire("unset_placeholder");
     }).bind(this), false);
@@ -17569,6 +18347,9 @@ wysihtml5.views.View = Base.extend(
     parser:               wysihtml5.dom.parse,
     // By default wysihtml5 will insert a <br> for line breaks, set this to false to use <p>
     useLineBreaks:        true,
+    // Double enter (enter on blank line) exits block element in useLineBreaks mode.
+    // It enables a way of escaping out of block elements and splitting block elements
+    doubleLineBreakEscapesBlock: true,
     // Array (or single string) of stylesheet urls to be loaded in the editor's iframe
     stylesheets:          [],
     // Placeholder text to use, defaults to the placeholder attribute on the textarea element
@@ -17592,7 +18373,7 @@ wysihtml5.views.View = Base.extend(
       uneditableContainer: "wysihtml5-uneditable-container"
     },
     // Browsers that support copied source handling will get a marking of the origin of the copied source (for determinig code cleanup rules on paste)
-    // Also copied source is based directly on selection -
+    // Also copied source is based directly on selection - 
     // (very useful for webkit based browsers where copy will otherwise contain a lot of code and styles based on whatever and not actually in selection).
     // If falsy value is passed source override is also disabled
     copyedFromMarking: '<meta name="copied-from" content="wysihtml5">'
@@ -18339,6 +19120,7 @@ wysihtml5.views.View = Base.extend(
     },
 
     _updateLinkStates: function() {
+
       var i, state, action, command, displayDialogAttributeValue,
           commandMapping      = this.commandMapping,
           composer            = this.composer,