diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /js/stage/stage.reel | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
| -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 }, |