diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/stage | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html | 2 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | 2 | ||||
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.html | 2 | ||||
-rwxr-xr-x | js/stage/layout.js | 6 | ||||
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.html | 2 | ||||
-rw-r--r-- | js/stage/objects-tray.reel/objects-tray.js | 10 | ||||
-rwxr-xr-x | js/stage/stage-deps.js | 16 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.html | 2 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.js | 116 | ||||
-rwxr-xr-x | js/stage/tool-handle.js | 38 |
10 files changed, 98 insertions, 98 deletions
diff --git a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html index 51c60e01..fb506f77 100755 --- a/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html +++ b/js/stage/binding-view.reel/binding-hud-option.reel/binding-hud-option.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html index 169fd741..6a501d93 100755 --- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html +++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/stage/binding-view.reel/binding-view.html b/js/stage/binding-view.reel/binding-view.html index bba789b8..9120f89e 100755 --- a/js/stage/binding-view.reel/binding-view.html +++ b/js/stage/binding-view.reel/binding-view.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/stage/layout.js b/js/stage/layout.js index 650d448f..bf7e79c3 100755 --- a/js/stage/layout.js +++ b/js/stage/layout.js | |||
@@ -221,7 +221,7 @@ exports.Layout = Montage.create(Component, { | |||
221 | 221 | ||
222 | var zoomFactor = 1; | 222 | var zoomFactor = 1; |
223 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { | 223 | if (this.stage._viewport && this.stage._viewport.style && this.stage._viewport.style.zoom) { |
224 | zoomFactor = Number(this.stage._viewport.style.zoom); | 224 | zoomFactor = Number(this.stage._viewport.style.zoom); |
225 | } | 225 | } |
226 | 226 | ||
227 | var sSL = this.stage._scrollLeft; | 227 | var sSL = this.stage._scrollLeft; |
@@ -309,7 +309,7 @@ exports.Layout = Montage.create(Component, { | |||
309 | { | 309 | { |
310 | return; | 310 | return; |
311 | } | 311 | } |
312 | 312 | ||
313 | try { | 313 | try { |
314 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { | 314 | if(element.nodeType == 1 && this.application.ninja.currentDocument.inExclusion(element) === -1 ) { |
315 | 315 | ||
@@ -393,5 +393,5 @@ exports.Layout = Montage.create(Component, { | |||
393 | } | 393 | } |
394 | } | 394 | } |
395 | 395 | ||
396 | 396 | ||
397 | }); | 397 | }); |
diff --git a/js/stage/objects-tray.reel/objects-tray.html b/js/stage/objects-tray.reel/objects-tray.html index ad76e302..51ee2cf3 100644 --- a/js/stage/objects-tray.reel/objects-tray.html +++ b/js/stage/objects-tray.reel/objects-tray.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/stage/objects-tray.reel/objects-tray.js b/js/stage/objects-tray.reel/objects-tray.js index 2494c2b5..d81c2a8c 100644 --- a/js/stage/objects-tray.reel/objects-tray.js +++ b/js/stage/objects-tray.reel/objects-tray.js | |||
@@ -46,19 +46,19 @@ exports.ObjectsTray = Montage.create(Component, { | |||
46 | offStageObjectsController : { | 46 | offStageObjectsController : { |
47 | value: null | 47 | value: null |
48 | }, | 48 | }, |
49 | 49 | ||
50 | _showAllObjects : { value: null }, | 50 | _showAllObjects : { value: null }, |
51 | showAllObjects : { | 51 | showAllObjects : { |
52 | get : function() { return this._showAllObjects; }, | 52 | get : function() { return this._showAllObjects; }, |
53 | set : function(value) { | 53 | set : function(value) { |
54 | if(value === this._showAllObjects) { return; } | 54 | if(value === this._showAllObjects) { return; } |
55 | 55 | ||
56 | this._showAllObjects = value; | 56 | this._showAllObjects = value; |
57 | 57 | ||
58 | this.needsDraw = true; | 58 | this.needsDraw = true; |
59 | } | 59 | } |
60 | }, | 60 | }, |
61 | 61 | ||
62 | workspaceMode : { | 62 | workspaceMode : { |
63 | get : function() { return this._workspaceMode; }, | 63 | get : function() { return this._workspaceMode; }, |
64 | set : function(value) { | 64 | set : function(value) { |
@@ -119,7 +119,7 @@ exports.ObjectsTray = Montage.create(Component, { | |||
119 | Draw Cycle | 119 | Draw Cycle |
120 | --------------------- */ | 120 | --------------------- */ |
121 | 121 | ||
122 | templateDidLoad: { | 122 | templateDidLoad: { |
123 | value: function() { | 123 | value: function() { |
124 | this.offStageObjectsController.filterFunction = this.offStageObjectFilter.bind(this); | 124 | this.offStageObjectsController.filterFunction = this.offStageObjectFilter.bind(this); |
125 | } | 125 | } |
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js index 058c6dbc..73164013 100755 --- a/js/stage/stage-deps.js +++ b/js/stage/stage-deps.js | |||
@@ -28,14 +28,14 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
33 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, | 33 | snapManager = require("js/helper-classes/3D/snap-manager").SnapManager, |
34 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, | 34 | viewUtils = require("js/helper-classes/3D/view-utils").ViewUtils, |
35 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, | 35 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, |
36 | ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, | 36 | ElementPlanes = require("js/helper-classes/3D/element-planes").ElementPlanes, |
37 | MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, | 37 | MathUtilsClass = require("js/helper-classes/3D/math-utils").MathUtilsClass, |
38 | VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 38 | VecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
39 | 39 | ||
40 | exports.StageDeps = Montage.create(Component, { | 40 | exports.StageDeps = Montage.create(Component, { |
41 | 41 | ||
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html index 5894bb60..b85e82cb 100755 --- a/js/stage/stage.reel/stage.html +++ b/js/stage/stage.reel/stage.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <!DOCTYPE html> | 1 | <!doctype html> |
2 | <!-- <copyright> | 2 | <!-- <copyright> |
3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
4 | All Rights Reserved. | 4 | All Rights Reserved. |
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 86df0903..49e7b641 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -28,10 +28,10 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
29 | </copyright> */ | 29 | </copyright> */ |
30 | 30 | ||
31 | var Montage = require("montage/core/core").Montage, | 31 | var Montage = require("montage/core/core").Montage, |
32 | Component = require("montage/ui/component").Component, | 32 | Component = require("montage/ui/component").Component, |
33 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, | 33 | drawUtils = require("js/helper-classes/3D/draw-utils").DrawUtils, |
34 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | 34 | vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; |
35 | 35 | ||
36 | exports.Stage = Montage.create(Component, { | 36 | exports.Stage = Montage.create(Component, { |
37 | 37 | ||
@@ -65,13 +65,13 @@ exports.Stage = Montage.create(Component, { | |||
65 | 65 | ||
66 | _resizeCanvases: { value: true }, | 66 | _resizeCanvases: { value: true }, |
67 | 67 | ||
68 | viewUtils: { | 68 | viewUtils: { |
69 | get: function() { return this.stageDeps.viewUtils; } | 69 | get: function() { return this.stageDeps.viewUtils; } |
70 | }, | 70 | }, |
71 | 71 | ||
72 | snapManager: { | 72 | snapManager: { |
73 | get: function() { return this.stageDeps.snapManager; } | 73 | get: function() { return this.stageDeps.snapManager; } |
74 | }, | 74 | }, |
75 | 75 | ||
76 | drawUtils: { | 76 | drawUtils: { |
77 | get: function() { return this.stageDeps.drawUtils; } | 77 | get: function() { return this.stageDeps.drawUtils; } |
@@ -567,7 +567,7 @@ exports.Stage = Montage.create(Component, { | |||
567 | this._clickPoint.y = point.y; // event.layerY; | 567 | this._clickPoint.y = point.y; // event.layerY; |
568 | 568 | ||
569 | this.enableMouseInOut(); | 569 | this.enableMouseInOut(); |
570 | 570 | ||
571 | this.application.ninja.toolsData.selectedToolInstance.downPoint.x = point.x; | 571 | this.application.ninja.toolsData.selectedToolInstance.downPoint.x = point.x; |
572 | this.application.ninja.toolsData.selectedToolInstance.downPoint.y = point.y; | 572 | this.application.ninja.toolsData.selectedToolInstance.downPoint.y = point.y; |
573 | this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonDown(event); | 573 | this.application.ninja.toolsData.selectedToolInstance.HandleLeftButtonDown(event); |
@@ -895,16 +895,16 @@ exports.Stage = Montage.create(Component, { | |||
895 | this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color; | 895 | this._drawingContext.strokeStyle = this._canvasDrawingPrefs.color; |
896 | this._drawingContext.lineWidth = this._canvasDrawingPrefs.thickness; | 896 | this._drawingContext.lineWidth = this._canvasDrawingPrefs.thickness; |
897 | 897 | ||
898 | //this._drawingContext.strokeRect(x,y,w,h); | 898 | //this._drawingContext.strokeRect(x,y,w,h); |
899 | this._drawingContext.beginPath(); | 899 | this._drawingContext.beginPath(); |
900 | this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 ); | 900 | this._drawingContext.moveTo( x0 + 0.5, y0 + 0.5 ); |
901 | this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 ); | 901 | this._drawingContext.lineTo( x1 + 0.5, y1 + 0.5 ); |
902 | this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 ); | 902 | this._drawingContext.lineTo( x2 + 0.5, y2 + 0.5 ); |
903 | this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 ); | 903 | this._drawingContext.lineTo( x3 + 0.5, y3 + 0.5 ); |
904 | this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 ); | 904 | this._drawingContext.lineTo( x0 + 0.5, y0 + 0.5 ); |
905 | 905 | ||