Merge branch 'refs/heads/NINJA-master' into TimelineUber

Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
author: Jonathan Duran 2012-07-17 09:30:22 -0700
committer: Jonathan Duran 2012-07-17 09:30:22 -0700
commit: 53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree: 79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/stage/stage.reel
parent: 7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent: 5146f224258929415adf4a8022e492454b4e2476 (diff)
download: ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
3 files changed, 94 insertions, 91 deletions
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css
index 7e66372e..56b4c58c 100755
--- a/js/stage/stage.reel/stage.css
+++ b/js/stage/stage.reel/stage.css
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 5894bb60..86fe895d 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -1,25 +1,26 @@
 <!DOCTYPE html>
 <!-- <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 86df0903..7c587989 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -28,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
-var Montage =   require("montage/core/core").Montage,
+var Montage =   require("montage/core/core").Montage,
    Component = require("montage/ui/component").Component,
    drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
-    vecUtils =  require("js/helper-classes/3D/vec-utils").VecUtils;
+    vecUtils =  require("js/helper-classes/3D/vec-utils").VecUtils;
 exports.Stage = Montage.create(Component, {
@@ -65,13 +66,13 @@ exports.Stage = Montage.create(Component, {
    _resizeCanvases: { value: true },
-        viewUtils: {
+    viewUtils: {
-                get: function()  {  return this.stageDeps.viewUtils;  }
+        get: function()  {  return this.stageDeps.viewUtils;  }
-        },
+    },
-        snapManager: {
+    snapManager: {
-                get: function()  {  return this.stageDeps.snapManager;  }
+        get: function()  {  return this.stageDeps.snapManager;  }
-        },
+    },
    drawUtils: {
        get: function()  {  return this.stageDeps.drawUtils;  }
@@ -567,7 +568,7 @@ exports.Stage = Montage.create(Component, {
            this._clickPoint.y = point.y; // event.layerY;
            this.enableMouseInOut();
-            
            this.application.ninja.toolsData.selectedToolInstance.downPoint.x = point.x;
            this.application.ninja.toolsData.selectedToolInstance.downPoint.y = point.y;
            this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonDown(event);
@@ -895,16 +896,16 @@ exports.Stage = Montage.create(Component, {
            this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color;
            this._drawingContext.lineWidth = this._canvasDrawingPrefs.thickness;
-                        //this._drawingContext.strokeRect(x,y,w,h);
+            //this._drawingContext.strokeRect(x,y,w,h);
-                        this._drawingContext.beginPath();
+            this._drawingContext.beginPath();
-                        this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 );
+            this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 );
-                        this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 );
+            this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 );
-                        this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 );
+            this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 );
-                        this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 );
+            this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 );
-                        this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 );
+            this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 );
-                        this._drawingContext.closePath();
+            this._drawingContext.closePath();
-                        this._drawingContext.stroke();
+            this._drawingContext.stroke();
            this._drawingContext.font = "10px sans-serif";
            this._drawingContext.textAlign = "right";
@@ -946,7 +947,7 @@ exports.Stage = Montage.create(Component, {
            var zoomFactor = 1;
            if (this._viewport && this._viewport.style && this._viewport.style.zoom) {
-                                zoomFactor = Number(this._viewport.style.zoom);
+                zoomFactor = Number(this._viewport.style.zoom);
            }
            var tmpMat = this.stageDeps.viewUtils.getLocalToGlobalMatrix( elt );
@@ -1088,9 +1089,9 @@ exports.Stage = Montage.create(Component, {
    /**
     * draw3DProjectedAndUnprojectedRectangles -- Draws a 3D rectangle used for marquee selection.
author	Jonathan Duran	2012-07-17 09:30:22 -0700
committer	Jonathan Duran	2012-07-17 09:30:22 -0700
commit	53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree	79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/stage/stage.reel
parent	7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent	5146f224258929415adf4a8022e492454b4e2476 (diff)
download	ninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz

diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 7e66372e..56b4c58c 100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css
@@ -1,24 +1,25 @@
1	/* <copyright>	1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc	2	Copyright (c) 2012, Motorola Mobility LLC.
3	All Rights Reserved.	3	All Rights Reserved.
4	BSD License.
5		4
6	Redistribution and use in source and binary forms, with or without	5	Redistribution and use in source and binary forms, with or without
7	modification, are permitted provided that the following conditions are met:	6	modification, are permitted provided that the following conditions are met:
8		7
9	- Redistributions of source code must retain the above copyright notice,	8	* Redistributions of source code must retain the above copyright notice,
10	this list of conditions and the following disclaimer.	9	this list of conditions and the following disclaimer.
11	- Redistributions in binary form must reproduce the above copyright	10
12	notice, this list of conditions and the following disclaimer in the	11	* Redistributions in binary form must reproduce the above copyright notice,
13	documentation and/or other materials provided with the distribution.	12	this list of conditions and the following disclaimer in the documentation
14	- Neither the name of Motorola Mobility nor the names of its contributors	13	and/or other materials provided with the distribution.
15	may be used to endorse or promote products derived from this software	14
16	without specific prior written permission.	15	* Neither the name of Motorola Mobility LLC nor the names of its
		16	contributors may be used to endorse or promote products derived from this
		17	software without specific prior written permission.
17		18
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS


diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 5894bb60..86fe895d 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html
@@ -1,25 +1,26 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility LLC.
4	All Rights Reserved.	4	All Rights Reserved.
5	BSD License.
6		5
7	Redistribution and use in source and binary forms, with or without	6	Redistribution and use in source and binary forms, with or without
8	modification, are permitted provided that the following conditions are met:	7	modification, are permitted provided that the following conditions are met:
9		8
10	- Redistributions of source code must retain the above copyright notice,	9	* Redistributions of source code must retain the above copyright notice,
11	this list of conditions and the following disclaimer.	10	this list of conditions and the following disclaimer.
12	- Redistributions in binary form must reproduce the above copyright	11
13	notice, this list of conditions and the following disclaimer in the	12	* Redistributions in binary form must reproduce the above copyright notice,
14	documentation and/or other materials provided with the distribution.	13	this list of conditions and the following disclaimer in the documentation
15	- Neither the name of Motorola Mobility nor the names of its contributors	14	and/or other materials provided with the distribution.
16	may be used to endorse or promote products derived from this software	15
17	without specific prior written permission.	16	* Neither the name of Motorola Mobility LLC nor the names of its
		17	contributors may be used to endorse or promote products derived from this
		18	software without specific prior written permission.
18		19
19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	20	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	21	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	22	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	23	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	24	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	25	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	26	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS


diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 86df0903..7c587989 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js
@@ -1,24 +1,25 @@
1	/* <copyright>	1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc	2	Copyright (c) 2012, Motorola Mobility LLC.
3	All Rights Reserved.	3	All Rights Reserved.
4	BSD License.
5		4
6	Redistribution and use in source and binary forms, with or without	5	Redistribution and use in source and binary forms, with or without
7	modification, are permitted provided that the following conditions are met:	6	modification, are permitted provided that the following conditions are met:
8		7
9	- Redistributions of source code must retain the above copyright notice,	8	* Redistributions of source code must retain the above copyright notice,
10	this list of conditions and the following disclaimer.	9	this list of conditions and the following disclaimer.
11	- Redistributions in binary form must reproduce the above copyright	10
12	notice, this list of conditions and the following disclaimer in the	11	* Redistributions in binary form must reproduce the above copyright notice,
13	documentation and/or other materials provided with the distribution.	12	this list of conditions and the following disclaimer in the documentation
14	- Neither the name of Motorola Mobility nor the names of its contributors	13	and/or other materials provided with the distribution.
15	may be used to endorse or promote products derived from this software	14
16	without specific prior written permission.	15	* Neither the name of Motorola Mobility LLC nor the names of its
		16	contributors may be used to endorse or promote products derived from this
		17	software without specific prior written permission.
17		18
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -28,10 +29,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	30	</copyright> */
30		31
31	var Montage = require("montage/core/core").Montage,	32	var Montage = require("montage/core/core").Montage,
32	Component = require("montage/ui/component").Component,	33	Component = require("montage/ui/component").Component,
33	drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,	34	drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils,
34	vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;	35	vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
35		36
36	exports.Stage = Montage.create(Component, {	37	exports.Stage = Montage.create(Component, {
37		38
@@ -65,13 +66,13 @@ exports.Stage = Montage.create(Component, {
65		66
66	_resizeCanvases: { value: true },	67	_resizeCanvases: { value: true },
67		68
68	viewUtils: {	69	viewUtils: {
69	get: function() { return this.stageDeps.viewUtils; }	70	get: function() { return this.stageDeps.viewUtils; }
70	},	71	},
71		72
72	snapManager: {	73	snapManager: {
73	get: function() { return this.stageDeps.snapManager; }	74	get: function() { return this.stageDeps.snapManager; }
74	},	75	},
75		76
76	drawUtils: {	77	drawUtils: {
77	get: function() { return this.stageDeps.drawUtils; }	78	get: function() { return this.stageDeps.drawUtils; }
@@ -567,7 +568,7 @@ exports.Stage = Montage.create(Component, {
567	this._clickPoint.y = point.y; // event.layerY;	568	this._clickPoint.y = point.y; // event.layerY;
568		569
569	this.enableMouseInOut();	570	this.enableMouseInOut();
570		571
571	this.application.ninja.toolsData.selectedToolInstance.downPoint.x = point.x;	572	this.application.ninja.toolsData.selectedToolInstance.downPoint.x = point.x;
572	this.application.ninja.toolsData.selectedToolInstance.downPoint.y = point.y;	573	this.application.ninja.toolsData.selectedToolInstance.downPoint.y = point.y;
573	this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonDown(event);	574	this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonDown(event);
@@ -895,16 +896,16 @@ exports.Stage = Montage.create(Component, {
895	this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color;	896	this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color;
896	this._drawingContext.lineWidth = this._canvasDrawingPrefs.thickness;	897	this._drawingContext.lineWidth = this._canvasDrawingPrefs.thickness;
897		898
898	//this._drawingContext.strokeRect(x,y,w,h);	899	//this._drawingContext.strokeRect(x,y,w,h);
899	this._drawingContext.beginPath();	900	this._drawingContext.beginPath();
900	this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 );	901	this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 );
901	this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 );	902	this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 );
902	this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 );	903	this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 );
903	this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 );	904	this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 );
904	this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 );	905	this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 );
905		906
906	this._drawingContext.closePath();	907	this._drawingContext.closePath();
907	this._drawingContext.stroke();	908	this._drawingContext.stroke();
908		909
909	this._drawingContext.font = "10px sans-serif";	910	this._drawingContext.font = "10px sans-serif";
910	this._drawingContext.textAlign = "right";	911	this._drawingContext.textAlign = "right";
@@ -946,7 +947,7 @@ exports.Stage = Montage.create(Component, {
946		947
947	var zoomFactor = 1;	948	var zoomFactor = 1;
948	if (this._viewport && this._viewport.style && this._viewport.style.zoom) {	949	if (this._viewport && this._viewport.style && this._viewport.style.zoom) {
949	zoomFactor = Number(this._viewport.style.zoom);	950	zoomFactor = Number(this._viewport.style.zoom);
950	}	951	}
951		952
952	var tmpMat = this.stageDeps.viewUtils.getLocalToGlobalMatrix( elt );	953	var tmpMat = this.stageDeps.viewUtils.getLocalToGlobalMatrix( elt );
@@ -1088,9 +1089,9 @@ exports.Stage = Montage.create(Component, {
1088		1089
1089	/**	1090	/**
1090	* draw3DProjectedAndUnprojectedRectangles -- Draws a 3D rectangle used for marquee selection.	1091	* draw3DProjectedAndUnprojectedRectangles -- Draws a 3D rectangle used for marquee selection.