zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'wise-doc' into collaboration

Browse Source 
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
parent bd888412f7 2db8cd5c96
commit 18dfd82c1d
64 changed files with 2099 additions and 9840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mindplot/src/main/javascript/MainTopic.js
View File

@@ -119,7 +119,7 @@ mindplot.MainTopic = new Class({
},
disconnect : function(workspace) {
mindplot.Topic.prototype.disconnect.call(this, workspace);
this.parent(workspace);
var size = this.getSize();
var model = this.getModel();