vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-15 11:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't serialize/deserialize invalid order values.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2011-05-10 19:28:24 -03:00
parent 84fbe241d0
commit 6b1cafb8fb
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mindplot/src/main/javascript/XMLMindmapSerializer_Beta.js
View File

@ -64,9 +64,12 @@ mindplot.XMLMindmapSerializer_Beta.prototype._topicToXML = function(document, to
} else } else
{ {
var order = topic.getOrder(); var order = topic.getOrder();
if(core.Utils.isDefined(order) && !isNaN(order-0))
{
parentTopic.setAttribute("order", order); parentTopic.setAttribute("order", order);
} }
} }
}
var text = topic.getText(); var text = topic.getText();
if (core.Utils.isDefined(text)) { if (core.Utils.isDefined(text)) {
@ -213,7 +216,7 @@ mindplot.XMLMindmapSerializer_Beta.prototype._deserializeNode = function(domElem
} }
var order = domElem.getAttribute('order'); var order = domElem.getAttribute('order');
if (core.Utils.isDefined(order)) { if (core.Utils.isDefined(order) && !isNaN(order-0)) {
topic.setOrder(order); topic.setOrder(order);
} }

5
mindplot/src/main/javascript/XMLMindmapSerializer_Pela.js
View File

@ -83,7 +83,10 @@ mindplot.XMLMindmapSerializer_Pela.prototype._topicToXML = function(document, to
// } else // } else
// { // {
var order = topic.getOrder(); var order = topic.getOrder();
if(core.Utils.isDefined(order) && !isNaN(order-0))
{
parentTopic.setAttribute("order", order); parentTopic.setAttribute("order", order);
}
// } // }
} }
@ -281,7 +284,7 @@ mindplot.XMLMindmapSerializer_Pela.prototype._deserializeNode = function(domElem
} }
var order = domElem.getAttribute('order'); var order = domElem.getAttribute('order');
if (core.Utils.isDefined(order)) { if (core.Utils.isDefined(order) && !isNaN(order-0)) {
topic.setOrder(parseInt(order)); topic.setOrder(parseInt(order));
} }

0
wise-webapp/src/test/data/wisemaps/strange-char.wxml Normal file
View File

4
wise-webapp/src/test/java/com/wisemapping/test/freemind/ExportTest.java → wise-webapp/src/test/java/com/wisemapping/test/freemind/FreemindExportTest.java
View File

@ -13,7 +13,7 @@ import org.testng.annotations.Test;
import java.io.*; import java.io.*;
@Test @Test
public class ExportTest { public class FreemindExportTest {
private static final String DATA_DIR_PATH = "src/test/data/wisemaps/"; private static final String DATA_DIR_PATH = "src/test/data/wisemaps/";
@Test(dataProvider = "Data-Provider-Function") @Test(dataProvider = "Data-Provider-Function")
@ -85,7 +85,7 @@ public class ExportTest {
final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() { final File[] freeMindFiles = dataDir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
return name.endsWith(".xml"); return name.endsWith(".wxml");
} }
}); });