diff options
author | Nivesh Rajbhandari | 2012-02-03 11:21:09 -0800 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-02-03 11:21:09 -0800 |
commit | c203ea7413b5a2b2232d7f8346cd1b9932f2575b (patch) | |
tree | 866f72ecc4af2f4a28b5f948ee9b03af2d32fce0 /js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js | |
parent | db73f720b692d63b55f7c773579fe23336ec0486 (diff) | |
parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
download | ninja-c203ea7413b5a2b2232d7f8346cd1b9932f2575b.tar.gz |
Merge branch 'refs/heads/master' into ToolFixes
Diffstat (limited to 'js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js')
-rw-r--r-- | js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js index 31582153..d9ae2686 100644 --- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js +++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js | |||
@@ -6,7 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
6 | 6 | ||
7 | var TreeControl = require("js/components/tree.reel").Tree, | 7 | var TreeControl = require("js/components/tree.reel").Tree, |
8 | ResizerControl = require("js/panels/Resizer").Resizer, | 8 | ResizerControl = require("js/panels/Resizer").Resizer, |
9 | nj = require("js/lib/NJUtils.js").NJUtils; | 9 | nj = require("js/lib/NJUtils").NJUtils; |
10 | 10 | ||
11 | exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { | 11 | exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { |
12 | hasTemplate: { | 12 | hasTemplate: { |
@@ -577,11 +577,11 @@ exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require | |||
577 | arrLinkedScrollersLength = arrLinkedScrollers.length, | 577 | arrLinkedScrollersLength = arrLinkedScrollers.length, |
578 | i = 0, | 578 | i = 0, |
579 | that = this; | 579 | that = this; |
580 | 580 | /* | |
581 | if (this.firstTimeDraw) { | 581 | if (this.firstTimeDraw) { |
582 | this.hasActiveProject="large"; | 582 | this.hasActiveProject="large"; |
583 | } | 583 | } |
584 | 584 | */ | |
585 | 585 | ||
586 | 586 | ||
587 | if (!this.hasActiveProject) { | 587 | if (!this.hasActiveProject) { |