Merge branch 'wise-doc' into collaboration

Conflicts:
	mindplot/pom.xml
	mindplot/src/main/javascript/DesignerActionRunner.js
	mindplot/src/main/javascript/DragTopic.js
	mindplot/src/main/javascript/MindmapDesigner.js
	wise-doc/src/main/webapp/html/editor.html
	wise-doc/src/main/webapp/js/editor.js
This commit is contained in:
Pablol
2011-08-07 19:51:03 -03:00
64 changed files with 2099 additions and 9840 deletions

View File

@@ -33,7 +33,7 @@ mindplot.CentralTopic = new Class({
setCursor : function(type) {
type = (type == 'move') ? 'default' : type;
mindplot.Topic.prototype.setCursor.call(this, type);
this.parent(type);
},
isConnectedToCentralTopic : function() {