Commit 4acd8fe4 by Tomas Alabes

Merge pull request #692 from tomasAlabes/stringBug

Wrong string comparison in print function
parents fa6ea627 4f5fe864
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -5034,7 +5034,7 @@ ...@@ -5034,7 +5034,7 @@
notfirst = 0, notfirst = 0,
path = E, path = E,
scale; scale;
R.is(font, string) && (font = this.getFont(font)); R.is(font, "string") && (font = this.getFont(font));
if (font) { if (font) {
scale = (size || 16) / font.face["units-per-em"]; scale = (size || 16) / font.face["units-per-em"];
var bb = font.face.bbox[split](separator), var bb = font.face.bbox[split](separator),
......
...@@ -3466,7 +3466,7 @@ ...@@ -3466,7 +3466,7 @@
= (object) data = (object) data
\*/ \*/
elproto.getData = function () { elproto.getData = function () {
return eldata[this.id] || {}; return clone(eldata[this.id] || {});
}; };
/*\ /*\
* Element.hover * Element.hover
...@@ -3893,13 +3893,13 @@ ...@@ -3893,13 +3893,13 @@
** **
> Parameters > Parameters
** **
- bbox (string) bbox to check with - bbox (object) bbox to check with
= (object) @Set = (object) @Set
\*/ \*/
paperproto.getElementsByBBox = function (bbox) { paperproto.getElementsByBBox = function (bbox) {
var set = this.set(); var set = this.set();
this.forEach(function (el) { this.forEach(function (el) {
if (Raphael.isBBoxIntersect(el.getBBox(), bbox)) { if (R.isBBoxIntersect(el.getBBox(), bbox)) {
set.push(el); set.push(el);
} }
}); });
...@@ -5414,7 +5414,7 @@ ...@@ -5414,7 +5414,7 @@
notfirst = 0, notfirst = 0,
path = E, path = E,
scale; scale;
R.is(font, string) && (font = this.getFont(font)); R.is(font, "string") && (font = this.getFont(font));
if (font) { if (font) {
scale = (size || 16) / font.face["units-per-em"]; scale = (size || 16) / font.face["units-per-em"];
var bb = font.face.bbox[split](separator), var bb = font.face.bbox[split](separator),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment