aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Project/projectpanelbase.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-03 12:20:10 -0800
committerValerio Virgillito2012-02-03 12:20:10 -0800
commite6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree39846bf1570f9b5a4057b726c54905de9e9e1c02 /js/panels/Project/projectpanelbase.reel
parent7950424cf704bb221971f4645406b01e6979db18 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
Merge branch 'master' into components
Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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) {