Merged wisemapping/wisemapping-open-source into develop

mindplot/src/main/javascript/Designer.js

@@ -1013,6 +1013,7 @@ mindplot.Designer = new Class(/** @lends Designer */{
             var topic = model.selectedTopic();
             if (topic) {
                 topic.showLinkEditor();
+                this.onObjectFocusEvent();
             }
         },
 
@@ -1022,6 +1023,7 @@ mindplot.Designer = new Class(/** @lends Designer */{
             var topic = model.selectedTopic();
             if (topic) {
                 topic.showNoteEditor();
+                this.onObjectFocusEvent();
             }
         },
 

mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js

@@ -15,9 +15,6 @@ var BootstrapDialog = new Class({
         this.options.onEventData.dialog = this;
         this._native = $('<div class="modal fade" tabindex="-1"></div>').append('<div class="modal-dialog"></div>');
         var content = $('<div class="modal-content"></div>');
-        content.on('keydown', function(event) {
-            event.stopPropagation();
-        });
         var header = this._buildHeader(title);
         if (header) {
             content.append(header);

mindplot/src/main/javascript/widget/Menu.js

@@ -353,6 +353,7 @@ mindplot.widget.Menu = new Class({
                         closeButton: true,
                         cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('shareIt', $msg('COLLABORATE'));
 
@@ -365,6 +366,7 @@ mindplot.widget.Menu = new Class({
                         closeButton: true,
                         cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('publishIt', $msg('PUBLISH'));
         }
@@ -377,6 +379,7 @@ mindplot.widget.Menu = new Class({
                     closeButton: true,
                     cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('history', $msg('HISTORY'));
         }
@@ -392,6 +395,7 @@ mindplot.widget.Menu = new Class({
                     closeButton: true,
                     cancelButton: true
                 });
+                designer.onObjectFocusEvent();
                 event.preventDefault();
             });
         }