aboutsummaryrefslogtreecommitdiff
path: root/js/tools/SelectionTool.js
diff options
context:
space:
mode:
authorhwc4872012-05-01 11:03:56 -0700
committerhwc4872012-05-01 11:03:56 -0700
commitf6983a69649b1c274ce6fe2d278a325994d092b6 (patch)
treea360297930c35f3097af16e9f6714ec501bd5894 /js/tools/SelectionTool.js
parent80715f4f0c45d29926184fa02e0a01b4e7642a79 (diff)
parentfb47c04b0a4d65f53d975311754aa0dd8a8a3f69 (diff)
downloadninja-f6983a69649b1c274ce6fe2d278a325994d092b6.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/tools/SelectionTool.js')
-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 7033ee3d..855c7b8c 100755
--- a/js/tools/SelectionTool.js
+++ b/js/tools/SelectionTool.js
@@ -751,10 +751,10 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
751 751
752 var zoomFactor = 1; 752 var zoomFactor = 1;
753 var viewPort = this.application.ninja.stage._viewport; 753 var viewPort = this.application.ninja.stage._viewport;
754 if (viewPort.style && viewPort.style.zoom) 754 if (viewPort && viewPort.style && viewPort.style.zoom) {
755 {
756 zoomFactor = Number(viewPort.style.zoom); 755 zoomFactor = Number(viewPort.style.zoom);
757 } 756 }
757
758 var tmpMat = viewUtils.getLocalToGlobalMatrix( item ); 758 var tmpMat = viewUtils.getLocalToGlobalMatrix( item );
759 for (var j=0; j<4; j++) 759 for (var j=0; j<4; j++)
760 { 760 {
@@ -863,7 +863,7 @@ var SelectionTool = exports.SelectionTool = Montage.create(ModifierToolBase, {
863 863
864 var zoomFactor = 1; 864 var zoomFactor = 1;
865 var viewPort = this.application.ninja.stage._viewport; 865 var viewPort = this.application.ninja.stage._viewport;
866 if (viewPort.style && viewPort.style.zoom) 866 if (viewPort && viewPort.style && viewPort.style.zoom)
867 { 867 {
868 zoomFactor = Number(viewPort.style.zoom); 868 zoomFactor = Number(viewPort.style.zoom);
869 } 869 }