diff options
author | Eric Guzman | 2012-02-16 00:22:43 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-16 00:22:43 -0800 |
commit | 82b1a273219f0ae3d119e156c7acccdbe478f441 (patch) | |
tree | 74c45e5e3afc6706b2f7a7918807f72c54cdcfc5 /js/panels/properties/content.reel | |
parent | af20ca9b11133dd5cefb9275dbe8fb101c3380d0 (diff) | |
parent | 966f0adaf1d4b7f2dd5a6e31643df58bff713884 (diff) | |
download | ninja-82b1a273219f0ae3d119e156c7acccdbe478f441.tar.gz |
Merge branch 'refs/heads/TreeComponents' into PresetsPanel
Diffstat (limited to 'js/panels/properties/content.reel')
-rwxr-xr-x[-rw-r--r--] | js/panels/properties/content.reel/content.css | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/panels/properties/content.reel/content.html | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | js/panels/properties/content.reel/content.js | 9 |
3 files changed, 9 insertions, 0 deletions
diff --git a/js/panels/properties/content.reel/content.css b/js/panels/properties/content.reel/content.css index 2537aea2..2537aea2 100644..100755 --- a/js/panels/properties/content.reel/content.css +++ b/js/panels/properties/content.reel/content.css | |||
diff --git a/js/panels/properties/content.reel/content.html b/js/panels/properties/content.reel/content.html index ab485323..ab485323 100644..100755 --- a/js/panels/properties/content.reel/content.html +++ b/js/panels/properties/content.reel/content.html | |||
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js index 1ec6d769..53926c78 100644..100755 --- a/js/panels/properties/content.reel/content.js +++ b/js/panels/properties/content.reel/content.js | |||
@@ -54,8 +54,17 @@ exports.Content = Montage.create(Component, { | |||
54 | this.eventManager.addEventListener( "elementChanging", this, false); | 54 | this.eventManager.addEventListener( "elementChanging", this, false); |
55 | } | 55 | } |
56 | 56 | ||
57 | this.eventManager.addEventListener("openDocument", this, false); | ||
58 | } | ||
59 | }, | ||
60 | |||
61 | // Document is opened - Display the current selection | ||
62 | handleOpenDocument: { | ||
63 | value: function() { | ||
64 | |||
57 | this.eventManager.addEventListener( "elementChange", this, false); | 65 | this.eventManager.addEventListener( "elementChange", this, false); |
58 | 66 | ||
67 | // For now always assume that the stage is selected by default | ||
59 | if(this.application.ninja.selectedElements.length === 0) { | 68 | if(this.application.ninja.selectedElements.length === 0) { |
60 | this.displayStageProperties(); | 69 | this.displayStageProperties(); |
61 | } | 70 | } |