diff options
| author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
| commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
| tree | b044208c38770c0c4edce03379071dbf2eb29b83 /js/stage | |
| parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'js/stage')
| -rwxr-xr-x | js/stage/stage.reel/stage.js | 1 |
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 | ||
| 12 | exports.Stage = Montage.create(Component, { | 12 | exports.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 }, |