aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Project
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-07 07:21:27 -0800
committerPushkar Joshi2012-02-07 07:21:27 -0800
commit4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch)
tree57f49ebfa5d3fcef28753b34015209edda6e620a /js/panels/Project
parente7aa17a9b472640355e95c54841399f6203050d4 (diff)
parent8950b342d1eda8bfa195372e1c17363a409651cd (diff)
downloadninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Project')
-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) {