diff options
author | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-10 15:33:20 -0800 |
commit | f7f445e8ced728d04de4bf1c5711f6756488a71e (patch) | |
tree | b09f00c28ff7123354af40509283ddec846f438d /js/stage/stage.reel/stage.js | |
parent | 632a5daca17acb774b9344ccc0e9107f1643924c (diff) | |
parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
download | ninja-f7f445e8ced728d04de4bf1c5711f6756488a71e.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
Diffstat (limited to 'js/stage/stage.reel/stage.js')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index 8c0f0fa0..852f480d 100755 --- a/js/stage/stage.reel/stage.js +++ b/js/stage/stage.reel/stage.js | |||
@@ -12,6 +12,7 @@ var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils; | |||
12 | 12 | ||
13 | exports.Stage = Montage.create(Component, { | 13 | exports.Stage = Montage.create(Component, { |
14 | 14 | ||
15 | textTool: { value: null }, | ||
15 | // TODO - Need to figure out how to remove this dependency | 16 | // TODO - Need to figure out how to remove this dependency |
16 | // Needed by some tools that depend on selectionDrawn event to set up some logic | 17 | // Needed by some tools that depend on selectionDrawn event to set up some logic |
17 | drawNow: { value : false }, | 18 | drawNow: { value : false }, |
@@ -779,6 +780,12 @@ exports.Stage = Montage.create(Component, { | |||
779 | } | 780 | } |
780 | }, | 781 | }, |
781 | 782 | ||
783 | toViewportCoordinates: { | ||
784 | value: function(x,y) { | ||
785 | return [x + this._userContentLeft, y + this._userContentTop]; | ||
786 | } | ||
787 | }, | ||
788 | |||
782 | setZoom: { | 789 | setZoom: { |
783 | value: function(value) { | 790 | value: function(value) { |
784 | if(!this._firstDraw) | 791 | if(!this._firstDraw) |