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

Merge branch 'master' into db-purge

Browse Source 
Conflicts:
	mindplot/src/main/javascript/MainTopic.js
	wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
	wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
This commit is contained in:
Paulo Gustavo Veiga
2012-11-04 01:38:52 -03:00
parent ef88ee06de cf0f0a8c00
commit a74efa4647
31 changed files with 1690 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mindplot/src/main/javascript/MultilineTextEditor.js
View File

@@ -157,6 +157,10 @@ mindplot.MultilineTextEditor = new Class({
},
show:function (topic, text) {
// Close a previous node editor if it's opened ...
if (this._topic) {
this.close(false);
}
this._topic = topic;
if (!this.isVisible()) {
@@ -272,7 +276,7 @@ mindplot.MultilineTextEditor = new Class({
},
close:function (update) {
if (this.isVisible()) {
if (this.isVisible() && this._topic) {
// Update changes ...
clearTimeout(this._timeoutId);
@@ -286,9 +290,9 @@ mindplot.MultilineTextEditor = new Class({
// Remove it form the screen ...
this._containerElem.dispose();
this._containerElem = null;
this._topic = null;
this._timeoutId = -1;
}
this._topic = null;
}
});