zcy
/
snap.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed text setting and getting. Removed superflous <tspan>

master
Dmitry Baranovskiy 2013-09-09 17:22:14 +10:00
parent 5bca0ff9db
commit 7a2ebfa2ac
4 changed files with 92 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demojs.html
View File

@ -102,7 +102,7 @@
18; 18;
var t = s.text(200, 120, ["S","A","V","A","G","E"]); var t = s.text(200, 120, ["S","A","V","A","G","E"]);
t.selectAll("tspan tspan:nth-child(odd)").attr({ t.selectAll("tspan:nth-child(odd)").attr({
fill: "#900", fill: "#900",
"font-size": "20px" "font-size": "20px"
}); });

6
dist/savage-min.js vendored
View File

File diff suppressed because one or more lines are too long

60
dist/savage.js vendored
View File

@ -3020,7 +3020,7 @@ function arrayFirstValue(arr) {
= (Fragment) the fragment = (Fragment) the fragment
\*/ \*/
Savage.parse = function (svg) { Savage.parse = function (svg) {
var f = document.createDocumentFragment(), var f = glob.doc.createDocumentFragment(),
pointer = f; pointer = f;
eve.on("elemental.tag", function (data, extra, raw) { eve.on("elemental.tag", function (data, extra, raw) {
var tag = $(data); var tag = $(data);
@ -3029,7 +3029,7 @@ Savage.parse = function (svg) {
pointer = tag; pointer = tag;
}); });
eve.on("elemental.text", function (text) { eve.on("elemental.text", function (text) {
pointer.appendChild(document.createTextNode(text)); pointer.appendChild(glob.doc.createTextNode(text));
}); });
eve.on("elemental./tag", function () { eve.on("elemental./tag", function () {
pointer = pointer.parentNode; pointer = pointer.parentNode;
@ -3069,7 +3069,7 @@ Fragment.prototype.selectAll = Element.prototype.selectAll;
\*/ \*/
Savage.fragment = function () { Savage.fragment = function () {
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
f = document.createDocumentFragment(); f = glob.doc.createDocumentFragment();
for (var i = 0, ii = args.length; i < ii; i++) { for (var i = 0, ii = args.length; i < ii; i++) {
var item = args[i]; var item = args[i];
if (item.node && item.node.nodeType) { if (item.node && item.node.nodeType) {
@ -3893,23 +3893,26 @@ eve.on("savage.util.attr.r", function (value) {
eve.on("savage.util.attr.text", function (value) { eve.on("savage.util.attr.text", function (value) {
if (this.type == "text") { if (this.type == "text") {
var i = 0, var i = 0,
node = this.node; node = this.node,
var tuner = function (chunk) { tuner = function (chunk) {
var out = $("tspan"); var out = $("tspan");
if (is(chunk, "array")) { if (is(chunk, "array")) {
for (var i = 0; i < chunk.length; i++) { for (var i = 0; i < chunk.length; i++) {
out.appendChild(tuner(chunk[i])); out.appendChild(tuner(chunk[i]));
}
} else {
out.appendChild(glob.doc.createTextNode(chunk));
} }
} else { out.normalize && out.normalize();
out.appendChild(glob.doc.createTextNode(chunk)); return out;
} };
out.normalize && out.normalize();
return out;
};
while (node.firstChild) { while (node.firstChild) {
node.removeChild(node.firstChild); node.removeChild(node.firstChild);
} }
node.appendChild(tuner(value)); var tuned = tuner(value);
while (tuned.firstChild) {
node.appendChild(tuned.firstChild);
}
} }
eve.stop(); eve.stop();
})(-1); })(-1);
@ -4366,6 +4369,31 @@ eve.on("savage.util.getattr.r", function () {
return $(this.node, "rx"); return $(this.node, "rx");
} }
})(-1); })(-1);
function textExtract(node) {
var out = [];
var children = node.childNodes;
for (var i = 0, ii = children.length; i < ii; i++) {
var chi = children[i];
if (chi.nodeType == 3) {
out.push(chi.nodeValue);
}
if (chi.tagName == "tspan") {
if (chi.childNodes.length == 1 && chi.firstChild.nodeType == 3) {
out.push(chi.firstChild.nodeValue);
} else {
out.push(textExtract(chi));
}
}
}
return out;
}
eve.on("savage.util.getattr.text", function () {
if (this.type == "text" || this.type == "tspan") {
eve.stop();
var out = textExtract(this.node);
return out.length == 1 ? out[0] : out;
}
})(-1);
eve.on("savage.util.getattr.#text", function () { eve.on("savage.util.getattr.#text", function () {
return this.node.textContent; return this.node.textContent;
})(-1); })(-1);

60
src/svg.js
View File

@ -2003,7 +2003,7 @@ function arrayFirstValue(arr) {
= (Fragment) the fragment = (Fragment) the fragment
\*/ \*/
Savage.parse = function (svg) { Savage.parse = function (svg) {
var f = document.createDocumentFragment(), var f = glob.doc.createDocumentFragment(),
pointer = f; pointer = f;
eve.on("elemental.tag", function (data, extra, raw) { eve.on("elemental.tag", function (data, extra, raw) {
var tag = $(data); var tag = $(data);
@ -2012,7 +2012,7 @@ Savage.parse = function (svg) {
pointer = tag; pointer = tag;
}); });
eve.on("elemental.text", function (text) { eve.on("elemental.text", function (text) {
pointer.appendChild(document.createTextNode(text)); pointer.appendChild(glob.doc.createTextNode(text));
}); });
eve.on("elemental./tag", function () { eve.on("elemental./tag", function () {
pointer = pointer.parentNode; pointer = pointer.parentNode;
@ -2052,7 +2052,7 @@ Fragment.prototype.selectAll = Element.prototype.selectAll;
\*/ \*/
Savage.fragment = function () { Savage.fragment = function () {
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
f = document.createDocumentFragment(); f = glob.doc.createDocumentFragment();
for (var i = 0, ii = args.length; i < ii; i++) { for (var i = 0, ii = args.length; i < ii; i++) {
var item = args[i]; var item = args[i];
if (item.node && item.node.nodeType) { if (item.node && item.node.nodeType) {
@ -2876,23 +2876,26 @@ eve.on("savage.util.attr.r", function (value) {
eve.on("savage.util.attr.text", function (value) { eve.on("savage.util.attr.text", function (value) {
if (this.type == "text") { if (this.type == "text") {
var i = 0, var i = 0,
node = this.node; node = this.node,
var tuner = function (chunk) { tuner = function (chunk) {
var out = $("tspan"); var out = $("tspan");
if (is(chunk, "array")) { if (is(chunk, "array")) {
for (var i = 0; i < chunk.length; i++) { for (var i = 0; i < chunk.length; i++) {
out.appendChild(tuner(chunk[i])); out.appendChild(tuner(chunk[i]));
}
} else {
out.appendChild(glob.doc.createTextNode(chunk));
} }
} else { out.normalize && out.normalize();
out.appendChild(glob.doc.createTextNode(chunk)); return out;
} };
out.normalize && out.normalize();
return out;
};
while (node.firstChild) { while (node.firstChild) {
node.removeChild(node.firstChild); node.removeChild(node.firstChild);
} }
node.appendChild(tuner(value)); var tuned = tuner(value);
while (tuned.firstChild) {
node.appendChild(tuned.firstChild);
}
} }
eve.stop(); eve.stop();
})(-1); })(-1);
@ -3349,6 +3352,31 @@ eve.on("savage.util.getattr.r", function () {
return $(this.node, "rx"); return $(this.node, "rx");
} }
})(-1); })(-1);
function textExtract(node) {
var out = [];
var children = node.childNodes;
for (var i = 0, ii = children.length; i < ii; i++) {
var chi = children[i];
if (chi.nodeType == 3) {
out.push(chi.nodeValue);
}
if (chi.tagName == "tspan") {
if (chi.childNodes.length == 1 && chi.firstChild.nodeType == 3) {
out.push(chi.firstChild.nodeValue);
} else {
out.push(textExtract(chi));
}
}
}
return out;
}
eve.on("savage.util.getattr.text", function () {
if (this.type == "text" || this.type == "tspan") {
eve.stop();
var out = textExtract(this.node);
return out.length == 1 ? out[0] : out;
}
})(-1);
eve.on("savage.util.getattr.#text", function () { eve.on("savage.util.getattr.#text", function () {
return this.node.textContent; return this.node.textContent;
})(-1); })(-1);