Fixes #33

yabwe · Oct 5, 2013 · 152757c · 152757c
1 parent 96b463e
commit 152757c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/dist/js/medium-editor.js b/dist/js/medium-editor.js
@@ -2,6 +2,7 @@ function MediumEditor(elements, options) {
     'use strict';
     return this.init(elements, options);
 }
+
 (function (window, document) {
     'use strict';
 
@@ -114,6 +115,10 @@ function MediumEditor(elements, options) {
                 if (e.which === 13 && !e.shiftKey) {
                     if (!(self.options.disableReturn || this.getAttribute('data-disable-return'))) {
                         document.execCommand('formatBlock', false, 'p');
+                        node = getSelectionStart();
+                        if (node.tagName.toLowerCase() === 'a') {
+                            document.execCommand('unlink', null, false);
+                        }
                     }
                 }
             });
@@ -389,17 +394,18 @@ function MediumEditor(elements, options) {
 
         showToolbarActions: function () {
             var self = this,
+                timeoutWrapper = function () {
+                    self.keepToolbarAlive = false;
+                    self.toolbar.style.display = 'none';
+                    document.removeEventListener('click', timeoutWrapper);
+                },
                 timer;
             this.anchorForm.style.display = 'none';
             this.toolbarActions.style.display = 'block';
             this.keepToolbarAlive = false;
             clearTimeout(timer);
             timer = setTimeout(function () {
-                document.addEventListener('click', function () {
-                    self.keepToolbarAlive = false;
-                    self.toolbar.style.display = 'none';
-                    document.removeEventListener('click', this);
-                });
+                document.addEventListener('click', timeoutWrapper);
             }, 300);
         },
 
@@ -436,7 +442,7 @@ function MediumEditor(elements, options) {
 
         createLink: function (input) {
             restoreSelection(this.savedSelection);
-            document.execCommand('CreateLink', false, input.value);
+            document.execCommand('createLink', false, input.value);
             this.showToolbarActions();
             input.value = '';
         },
@@ -517,5 +523,7 @@ function MediumEditor(elements, options) {
             }
             return this;
         }
+
     };
+
 }(window, document));