5.8.1

yabwe · Sep 16, 2015 · a3a2efb · a3a2efb
1 parent b72369c
commit a3a2efb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+5.8.1 / 2015-09-16
+==================
+* Fix inconsistancies and errors in isDescendant utility method
+
+
 5.8.0 / 2015-09-13
 ==================
 * Added relativeContainer options for the toolbar

diff --git a/dist/js/medium-editor.js b/dist/js/medium-editor.js
@@ -654,8 +654,12 @@ MediumEditor.extensions = {};
             if (!parent || !child) {
                 return false;
             }
-            if (checkEquality && parent === child) {
-                return true;
+            if (parent === child) {
+                return !!checkEquality;
+            }
+            // If parent is not an element, it can't have any descendants
+            if (parent.nodeType !== 1) {
+                return false;
             }
             if (nodeContainsWorksWithTextNodes || child.nodeType !== 3) {
                 return parent.contains(child);
@@ -6382,7 +6386,7 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.8.0'
+    'version': '5.8.1'
 }).version);
 
     return MediumEditor;

diff --git a/dist/js/medium-editor.min.js b/dist/js/medium-editor.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-editor",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "author": "Davi Ferreira <[email protected]>",
   "contributors": [
     {

diff --git a/src/js/version.js b/src/js/version.js
@@ -15,5 +15,5 @@ MediumEditor.parseVersionString = function (release) {
 
 MediumEditor.version = MediumEditor.parseVersionString.call(this, ({
     // grunt-bump looks for this:
-    'version': '5.8.0'
+    'version': '5.8.1'
 }).version);