diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js
index dc2d5ca4..a7698c02 100644
--- a/mindplot/src/main/javascript/Designer.js
+++ b/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();
}
},
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
index 62ecc3de..83f37aef 100644
--- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
+++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
@@ -15,9 +15,6 @@ var BootstrapDialog = new Class({
this.options.onEventData.dialog = this;
this._native = $('').append('');
var content = $('');
- content.on('keydown', function(event) {
- event.stopPropagation();
- });
var header = this._buildHeader(title);
if (header) {
content.append(header);
diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index d513d2e6..313c14a8 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/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();
});
}
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
index e9c5b982..6180248f 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
@@ -100,4 +100,28 @@ public class Collaboration {
return this.getRole().ordinal() <= role.ordinal();
}
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ Collaboration that = (Collaboration) o;
+
+ if (id != that.id) return false;
+ if (collaborator != null ? !collaborator.equals(that.collaborator) : that.collaborator != null) return false;
+ if (mindMap != null ? !mindMap.equals(that.mindMap) : that.mindMap != null) return false;
+ if (role != that.role) return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int result = (int) (id ^ (id >>> 32));
+ result = 31 * result + (role != null ? role.hashCode() : 0);
+ result = 31 * result + (mindMap != null ? mindMap.hashCode() : 0);
+ result = 31 * result + (collaborator != null ? collaborator.hashCode() : 0);
+ return result;
+ }
}
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
index d3fa1a7d..0148b725 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
@@ -65,7 +65,7 @@
:
- "/>
diff --git a/wise-webapp/src/test/resources/data/freemind/basic.wxml b/wise-webapp/src/test/resources/data/freemind/basic.wxml
index 4a356961..6575307e 100644
--- a/wise-webapp/src/test/resources/data/freemind/basic.wxml
+++ b/wise-webapp/src/test/resources/data/freemind/basic.wxml
@@ -1,28 +1,28 @@