Wiki page editor: Do not lose editor focus when clicking a toolbar button.

1 files changed, 10 insertions, 2 deletions

diff --git a/static/js/wiki.js b/static/js/wiki.js
index a208f36..4b87549 100644
--- a/static/js/wiki.js
+++ b/static/js/wiki.js
@@ -59,11 +59,19 @@ jQuery(function ($) {
 
     Aloha.ready(function() {
 	var $$ = Aloha.jQuery;
-	$('#wiki-page-content').on('blur', function() {
+
+        $('html').click(function() {
             mulk.savePage();
             $$('#wiki-page-content').mahalo();
         });
-        $('#wiki-page-content').dblclick(function() {
+        $('#wiki-page-content').click(function(event) {
+            event.stopPropagation();
+        });
+        $('.aloha-floatingmenu').click(function(event) {
+            event.stopPropagation();
+        });
+
+        $('#wiki-page-content').click(function() {
             $$('#wiki-page-content').aloha();
         });
     });