more embed intent ux fixes

bustle · Jul 22, 2014 · a6321a4 · a6321a4
1 parent 822d40a
commit a6321a4
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 28 deletions.
diff --git a/dist/content-kit-editor.css b/dist/content-kit-editor.css
@@ -213,7 +213,7 @@
   font-size: 2em;
   line-height: 0.7em;
   cursor: pointer;
-  transition: color 0.15s, border-color 0.15s, -webkit-transform 0.35s;
+  transition: color 0.15s, border-color 0.15s, transform 0.35s;
   -webkit-animation: pop 0.5s linear;
   animation: pop 0.5s linear;
 }

diff --git a/dist/content-kit-editor.js b/dist/content-kit-editor.js
@@ -3,7 +3,7 @@
  * @version  0.1.0
  * @author   Garth Poitras <[email protected]> (http://garthpoitras.com/)
  * @license  MIT
- * Last modified: Jul 18, 2014
+ * Last modified: Jul 22, 2014
  */
 
 (function(exports, document) {
@@ -166,7 +166,8 @@ function positionElementToRightOf(element, rightOfElement) {
 }
 
 function getDirectionOfSelection(selection) {
-  var position = selection.anchorNode.compareDocumentPosition(selection.focusNode);
+  var node = selection.anchorNode;
+  var position = node && node.compareDocumentPosition(selection.focusNode);
   if (position & Node.DOCUMENT_POSITION_FOLLOWING) {
     return SelectionDirection.LEFT_TO_RIGHT;
   } else if (position & Node.DOCUMENT_POSITION_PRECEDING) {
@@ -183,7 +184,7 @@ function getCurrentSelectionNode(selection) {
 
 function getCurrentSelectionRootNode() {
   var node = getCurrentSelectionNode();
-  var tag = node.tagName;
+  var tag = node && node.tagName;
   while (tag && RootTags.indexOf(tag) === -1) {
     if (node.contentEditable === 'true') { break; } // Stop traversing up dom when hitting an editor element
     node = node.parentNode;
@@ -625,7 +626,6 @@ ContentKit.Editor = (function() {
     if (element) {
       var className = element.className;
       var dataset = element.dataset;
-      var textFormatToolbar = new Toolbar({ commands: editor.textFormatCommands });
 
       if (!editorClassNameRegExp.test(className)) {
         className += (className ? ' ' : '') + editorClassName;
@@ -641,20 +641,23 @@ ContentKit.Editor = (function() {
 
       element.setAttribute('contentEditable', true);
       editor.element = element;
-      editor.textFormatToolbar = textFormatToolbar;
+
+      bindTextSelectionEvents(editor);
+      bindTypingEvents(editor);
+      bindPasteEvents(editor);
 
       var linkTooltips = new Tooltip({ rootElement: element, showForTag: Tags.LINK });
 
+      editor.textFormatToolbar = new Toolbar({ commands: editor.textFormatCommands });
+
       if(editor.embedCommands) {
+        // NOTE: must come after bindTypingEvents so those keyup handlers are executed first.
+        // TODO: manage event listener order
         var embedIntent = new EmbedIntent({
           commands: editor.embedCommands,
           rootElement: element
         });
       }
-
-      bindTextSelectionEvents(editor);
-      bindTypingEvents(editor);
-      bindPasteEvents(editor);
 
       if(editor.autofocus) { element.focus(); }
     }
@@ -1040,11 +1043,11 @@ var EmbedIntent = (function() {
     embedIntent.isActive = false;
 
     function embedIntentHandler(e) {
-      if (!selectionIsInElement(window.getSelection(), rootElement)) {
+      var currentNode = getCurrentSelectionRootNode();
+      if (!currentNode) {
         embedIntent.hide();
         return;
       }
-      var currentNode = getCurrentSelectionRootNode();
       var currentNodeHTML = currentNode.innerHTML;
       if (currentNodeHTML === '' || currentNodeHTML === '<br>') {
         embedIntent.showAt(currentNode);
@@ -1059,7 +1062,7 @@ var EmbedIntent = (function() {
 
     document.addEventListener('keyup', function(e) {
       if (e.keyCode === Keycodes.ESC) {
-        embedIntent.deactivate();
+        embedIntent.hide();
       }
     });
 
@@ -1078,6 +1081,7 @@ var EmbedIntent = (function() {
       }
     },
     showAt: function(node) {
+      this.hide();
       this.show();
       this.atNode = node;
       positionElementToLeftOf(this.element, node);

diff --git a/gulpfile.js b/gulpfile.js
@@ -71,7 +71,7 @@ gulp.task('lint', function() {
       .pipe(jshint.reporter('default'));
 });
 
-gulp.task('lint-built', function() {
+gulp.task('lint-built', ['build'], function() {
   return gulp.src(jsDistPath)
              .pipe(jshint('.jshintrc'))
              .pipe(jshint.reporter('default'));
@@ -91,12 +91,12 @@ gulp.task('build', function() {
       .pipe(gulp.dest(distDest));
 });
 
-gulp.task('test', function() {
+gulp.task('test', ['build', 'lint-built'], function() {
   return gulp.src(testRunner)
              .pipe(qunit());
 });
 
-gulp.task('test-browser', function(){
+gulp.task('test-browser', ['build', 'lint-built'], function(){
   return gulp.src(testRunner)
              .pipe(open('<% file.path %>')); 
 });

diff --git a/src/css/embeds.less b/src/css/embeds.less
@@ -19,7 +19,7 @@
   font-size: 2em;
   line-height: 0.7em;
   cursor: pointer;
-  transition: color 0.15s, border-color 0.15s, -webkit-transform 0.35s;
+  transition: color 0.15s, border-color 0.15s, transform 0.35s;
   -webkit-animation: pop 0.5s linear;
           animation: pop 0.5s linear;
 }

diff --git a/src/js/editor.js b/src/js/editor.js
@@ -53,7 +53,6 @@ ContentKit.Editor = (function() {
     if (element) {
       var className = element.className;
       var dataset = element.dataset;
-      var textFormatToolbar = new Toolbar({ commands: editor.textFormatCommands });
 
       if (!editorClassNameRegExp.test(className)) {
         className += (className ? ' ' : '') + editorClassName;
@@ -69,20 +68,23 @@ ContentKit.Editor = (function() {
 
       element.setAttribute('contentEditable', true);
       editor.element = element;
-      editor.textFormatToolbar = textFormatToolbar;
+
+      bindTextSelectionEvents(editor);
+      bindTypingEvents(editor);
+      bindPasteEvents(editor);
 
       var linkTooltips = new Tooltip({ rootElement: element, showForTag: Tags.LINK });
 
+      editor.textFormatToolbar = new Toolbar({ commands: editor.textFormatCommands });
+
       if(editor.embedCommands) {
+        // NOTE: must come after bindTypingEvents so those keyup handlers are executed first.
+        // TODO: manage event listener order
         var embedIntent = new EmbedIntent({
           commands: editor.embedCommands,
           rootElement: element
         });
       }
-
-      bindTextSelectionEvents(editor);
-      bindTypingEvents(editor);
-      bindPasteEvents(editor);
 
       if(editor.autofocus) { element.focus(); }
     }

diff --git a/src/js/embed-intent.js b/src/js/embed-intent.js
@@ -23,11 +23,11 @@ var EmbedIntent = (function() {
     embedIntent.isActive = false;
 
     function embedIntentHandler(e) {
-      if (!selectionIsInElement(window.getSelection(), rootElement)) {
+      var currentNode = getCurrentSelectionRootNode();
+      if (!currentNode) {
         embedIntent.hide();
         return;
       }
-      var currentNode = getCurrentSelectionRootNode();
       var currentNodeHTML = currentNode.innerHTML;
       if (currentNodeHTML === '' || currentNodeHTML === '<br>') {
         embedIntent.showAt(currentNode);
@@ -42,7 +42,7 @@ var EmbedIntent = (function() {
 
     document.addEventListener('keyup', function(e) {
       if (e.keyCode === Keycodes.ESC) {
-        embedIntent.deactivate();
+        embedIntent.hide();
       }
     });
 
@@ -61,6 +61,7 @@ var EmbedIntent = (function() {
       }
     },
     showAt: function(node) {
+      this.hide();
       this.show();
       this.atNode = node;
       positionElementToLeftOf(this.element, node);

diff --git a/src/js/utils/selection-utils.js b/src/js/utils/selection-utils.js
@@ -1,5 +1,6 @@
 function getDirectionOfSelection(selection) {
-  var position = selection.anchorNode.compareDocumentPosition(selection.focusNode);
+  var node = selection.anchorNode;
+  var position = node && node.compareDocumentPosition(selection.focusNode);
   if (position & Node.DOCUMENT_POSITION_FOLLOWING) {
     return SelectionDirection.LEFT_TO_RIGHT;
   } else if (position & Node.DOCUMENT_POSITION_PRECEDING) {
@@ -16,7 +17,7 @@ function getCurrentSelectionNode(selection) {
 
 function getCurrentSelectionRootNode() {
   var node = getCurrentSelectionNode();
-  var tag = node.tagName;
+  var tag = node && node.tagName;
   while (tag && RootTags.indexOf(tag) === -1) {
     if (node.contentEditable === 'true') { break; } // Stop traversing up dom when hitting an editor element
     node = node.parentNode;