aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Project/projectpanelbase.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-02 18:04:37 -0800
committerJose Antonio Marquez2012-02-02 18:04:37 -0800
commit7959d2ecc6e8b1799307de1ceab1112b8ab58e8d (patch)
treece4e32578e1af4d49b8375933a6b7edd0a095b0f /js/panels/Project/projectpanelbase.reel
parent83ac41dd75ec551cdb03252e0bf3081182517d05 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-7959d2ecc6e8b1799307de1ceab1112b8ab58e8d.tar.gz
Merge branch 'refs/heads/NinjaInternal' into Color
Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
Diffstat (limited to 'js/panels/Project/projectpanelbase.reel')
-rw-r--r--js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js6
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
7var TreeControl = require("js/components/tree.reel").Tree, 7var 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
11exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { 11exports.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) {