aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-12 14:24:25 -0700
committerNivesh Rajbhandari2012-04-12 14:24:25 -0700
commit77c6ab76ffe9fc380ed6fdb7b29ccd40acaee74d (patch)
tree18a1f0e3679c0eb993a9dedb537035d3861f49ac /js
parent3bbf32b285405562471fa594c283e271d347734e (diff)
downloadninja-77c6ab76ffe9fc380ed6fdb7b29ccd40acaee74d.tar.gz
Fixing selection/tag layout drawing when canvas and image elements have borders.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/data/pi/pi-data.js2
-rwxr-xr-xjs/helper-classes/3D/view-utils.js13
2 files changed, 2 insertions, 13 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 07017f09..157c54ec 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -131,6 +131,8 @@ exports.PiData = Montage.create( Montage, {
131 type : "hottext", 131 type : "hottext",
132 id : "borderWidth", 132 id : "borderWidth",
133 prop : "border-width", 133 prop : "border-width",
134 defaultValue: 0,
135 valueMutator: parseFloat,
134 label : "Border", 136 label : "Border",
135 min : 0, 137 min : 0,
136 max : 100, 138 max : 100,
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index addabba5..1cd1c313 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -603,19 +603,6 @@ exports.ViewUtils = Montage.create(Component, {
603 w = elt.offsetWidth, 603 w = elt.offsetWidth,
604 h = elt.offsetHeight; 604 h = elt.offsetHeight;
605 605
606 if(elt.width)
607 w = elt.width;
608 if(elt.height)
609 h = elt.height;
610
611 if (elt.style)
612 {
613 if (elt.style.left) left = MathUtils.styleToNumber(elt.style.left);
614 if (elt.style.top) top = MathUtils.styleToNumber(elt.style.top);
615 if (elt.style.width) w = MathUtils.styleToNumber(elt.style.width);
616 if (elt.style.height) h = MathUtils.styleToNumber(elt.style.height);
617 }
618
619// if (elt instanceof SVGSVGElement) { 606// if (elt instanceof SVGSVGElement) {
620 if(elt.nodeName.toLowerCase() === "svg") { 607 if(elt.nodeName.toLowerCase() === "svg") {
621 if(w instanceof SVGAnimatedLength) 608 if(w instanceof SVGAnimatedLength)