zcy
/
svgedit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue 251: Translate text into proper XML 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@761 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Jeff Schiller 2009-10-05 08:16:41 +00:00
parent 757957ba35
commit d46bdcba0d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/svgcanvas.js
View File

@ -29,6 +29,13 @@ var svgWhiteList = {
"title": [], "title": [],
}; };
var toXml = function(str) {
return str.replace("&", "&amp;").replace("<", "&lt;").replace(">","&gt;");
};
var fromXml = function(str) {
return str.replace("&gt;", ">").replace("&lt;", "<").replace("&amp;", "&");
};
function SvgCanvas(c) function SvgCanvas(c)
{ {
@ -917,7 +924,7 @@ function BatchCommand(text) {
var str = child.nodeValue.replace(/^\s+|\s+$/g, ""); var str = child.nodeValue.replace(/^\s+|\s+$/g, "");
if (str != "") { if (str != "") {
bOneLine = true; bOneLine = true;
out.push(str + ""); out.push(toXml(str) + "");
} }
break; break;
case 8: // comment case 8: // comment
@ -2247,7 +2254,7 @@ function BatchCommand(text) {
var next_x = getPolyPoint(next_index)[0]; var next_x = getPolyPoint(next_index)[0];
var next_y = getPolyPoint(next_index)[1]; var next_y = getPolyPoint(next_index)[1];
console.log(getPolyPoint(0,true)[0], getPolyPoint(0,true)[1]); // console.log(getPolyPoint(0,true)[0], getPolyPoint(0,true)[1]);
var next_rel_x = next_x - cur_x; var next_rel_x = next_x - cur_x;
var next_rel_y = next_y - cur_y; var next_rel_y = next_y - cur_y;
@ -3048,6 +3055,7 @@ function BatchCommand(text) {
}; };
this.setCurrentLayer = function(name) { this.setCurrentLayer = function(name) {
name = toXml(name);
for (var i = 0; i < all_layers.length; ++i) { for (var i = 0; i < all_layers.length; ++i) {
if (name == all_layers[i][0]) { if (name == all_layers[i][0]) {
if (current_layer != all_layers[i][1]) { if (current_layer != all_layers[i][1]) {
@ -3073,7 +3081,7 @@ function BatchCommand(text) {
if (all_layers[i][1] == oldLayer) break; if (all_layers[i][1] == oldLayer) break;
} }
var oldname = all_layers[i][0]; var oldname = all_layers[i][0];
all_layers[i][0] = newname; all_layers[i][0] = toXml(newname);
// now change the underlying title element contents // now change the underlying title element contents
var len = oldLayer.childNodes.length; var len = oldLayer.childNodes.length;
@ -3171,7 +3179,7 @@ function BatchCommand(text) {
// used internally // used internally
var getLayerName = function(g) { var getLayerName = function(g) {
return $(g,"title").text(); return $("title",g).text();
}; };
this.clear = function() { this.clear = function() {