aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-14 11:09:16 -0800
committerValerio Virgillito2012-02-14 11:09:16 -0800
commit33c805d441abb2f83fd1ac9ee2d3d4282acc009f (patch)
tree0f6701bb8b4ea952a790c6f3ff03c759ef352206 /js/stage
parentf060190a3bffd9a16718f2ce0499699103d46372 (diff)
parent266f27fc9b2beef0378b2e49e93b5f217b1abde8 (diff)
downloadninja-33c805d441abb2f83fd1ac9ee2d3d4282acc009f.tar.gz
Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into integration
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 89b2d475..59eb9317 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -11,7 +11,6 @@ var Montage = require("montage/core/core").Montage,
11 11
12exports.Stage = Montage.create(Component, { 12exports.Stage = Montage.create(Component, {
13 13
14 textTool: { value: null },
15 // TODO - Need to figure out how to remove this dependency 14 // 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 15 // Needed by some tools that depend on selectionDrawn event to set up some logic
17 drawNow: { value : false }, 16 drawNow: { value : false },