aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-30 16:15:47 -0700
committerValerio Virgillito2012-04-30 16:15:47 -0700
commit9c8fbdd11fdbe9ae73d57147de84b799c5a87652 (patch)
tree9a6d798fcbf33518f1488ed84fa075c707ecffd0 /js/tools
parent6b1a6994d98a18b45016b97ac8d81483109a586c (diff)
downloadninja-9c8fbdd11fdbe9ae73d57147de84b799c5a87652.tar.gz
Squashed commit of stage architecture
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/SelectionTool.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/SelectionTool.js b/js/tools/SelectionTool.js
index 9c9aee93..f7b583b5 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -753,10 +753,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
753 753
754 var zoomFactor = 1; 754 var zoomFactor = 1;
755 var viewPort = this.application.ninja.stage._viewport; 755 var viewPort = this.application.ninja.stage._viewport;
756 if (viewPort.style && viewPort.style.zoom) 756 if (viewPort && viewPort.style && viewPort.style.zoom) {
757 {
758 zoomFactor = Number(viewPort.style.zoom); 757 zoomFactor = Number(viewPort.style.zoom);
759 } 758 }
759
760 var tmpMat = viewUtils.getLocalToGlobalMatrix( item ); 760 var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
761 for (var j=0; j<4; j++) 761 for (var j=0; j<4; j++)
762 { 762 {
@@ -865,7 +865,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
865 865
866 var zoomFactor = 1; 866 var zoomFactor = 1;
867 var viewPort = this.application.ninja.stage._viewport; 867 var viewPort = this.application.ninja.stage._viewport;
868 if (viewPort.style && viewPort.style.zoom) 868 if (viewPort && viewPort.style && viewPort.style.zoom)
869 { 869 {
870 zoomFactor = Number(viewPort.style.zoom); 870 zoomFactor = Number(viewPort.style.zoom);
871 } 871 }