don't show toolbar when only selecting whitespace

bustle · Jul 15, 2014 · 565f8b1 · 565f8b1
1 parent 518ad4d
commit 565f8b1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dist/content-kit-editor.js b/dist/content-kit-editor.js
@@ -615,10 +615,10 @@ ContentKit.Editor = (function() {
 
   function handleTextSelection(e, editor) {
     var selection = window.getSelection();
-    if (!selection.isCollapsed && selectionIsInElement(editor.element, selection)) {
-      editor.toolbar.updateForSelection(selection);
-    } else {
+    if (selection.isCollapsed || selection.toString().trim() === '' || !selectionIsInElement(editor.element, selection)) {
       editor.toolbar.hide();
+    } else {
+      editor.toolbar.updateForSelection(selection);
     }
   }
 

diff --git a/src/js/editor.js b/src/js/editor.js
@@ -155,10 +155,10 @@ ContentKit.Editor = (function() {
 
   function handleTextSelection(e, editor) {
     var selection = window.getSelection();
-    if (!selection.isCollapsed && selectionIsInElement(editor.element, selection)) {
-      editor.toolbar.updateForSelection(selection);
-    } else {
+    if (selection.isCollapsed || selection.toString().trim() === '' || !selectionIsInElement(editor.element, selection)) {
       editor.toolbar.hide();
+    } else {
+      editor.toolbar.updateForSelection(selection);
     }
   }