Author: Christian Lopes
Date: 2011-05-09 12:07:56 -0700 (Mon, 09 May 2011)
New Revision: 24966
Modified:
cytoscapeweb/trunk/cytoscapeweb/html-template/js/tests.js
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/ShowErrorCommand.as
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
Log:
Fixed test errors on Firefox 4 and issue with parsing json code that contains
tabs (also FF4).
Modified: cytoscapeweb/trunk/cytoscapeweb/html-template/js/tests.js
===================================================================
--- cytoscapeweb/trunk/cytoscapeweb/html-template/js/tests.js 2011-05-09
18:50:14 UTC (rev 24965)
+++ cytoscapeweb/trunk/cytoscapeweb/html-template/js/tests.js 2011-05-09
19:07:56 UTC (rev 24966)
@@ -1339,9 +1339,9 @@
same(svg.find(".cw-background").length, 1, "Background rectangle");
same(svg.find(".cw-node").length, nodes.length, "Number of SVG nodes");
- same(svg.find(".cw-node .cw-node-shape").length, nodes.length, "Number
of SVG node shapes");
+ same(svg.find(".cw-node-shape").length, nodes.length, "Number of SVG
node shapes");
same(svg.find(".cw-edge").length, edges.length, "Number of SVG edges");
- same(svg.find(".cw-edge .cw-edge-line").length, edges.length, "Number
of SVG edge lines");
+ same(svg.find(".cw-edge-line").length, edges.length, "Number of SVG
edge lines");
// TODO: test node images
// TODO: test edge arrows
Modified:
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/ShowErrorCommand.as
===================================================================
---
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/ShowErrorCommand.as
2011-05-09 18:50:14 UTC (rev 24965)
+++
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/controller/ShowErrorCommand.as
2011-05-09 19:07:56 UTC (rev 24966)
@@ -70,7 +70,7 @@
private function encode(str:*):String {
if (str is String) {
- str = str.replace(/\\/g, "\\\\").replace(/\"/g,
"'").replace(/\n/g, "\\n");
+ str = str.replace(/\\/g, "\\\\").replace(/\"/g,
"'").replace(/\n/g, "\\n").replace(/\t/g, " ");
}
return str;
}
Modified:
cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
===================================================================
--- cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
2011-05-09 18:50:14 UTC (rev 24965)
+++ cytoscapeweb/trunk/cytoscapeweb/src/org/cytoscapeweb/model/GraphProxy.as
2011-05-09 19:07:56 UTC (rev 24966)
@@ -424,7 +424,7 @@
v = ExternalObjectConverter.normalizeDataValue(v,
f.type, f.defaultValue);
ds.data[k] = v;
} else {
- throw new Error("Cannot update data: there is no
Data Field for '"+k+".");
+ throw new Error("Cannot update data: there is no
Data Field for '"+k+"'.");
}
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
