aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Project
diff options
context:
space:
mode:
authorJonathan Duran2012-07-17 09:30:22 -0700
committerJonathan Duran2012-07-17 09:30:22 -0700
commit53051672a62208fbc96957719d8285fac6431ed6 (patch)
tree79d542ee811044e8af2ef84aa0d6662c6eb895c4 /js/panels/Project
parent7e2c2dbd040ed79a3f0678f91bd4b6db9cf69231 (diff)
parent5146f224258929415adf4a8022e492454b4e2476 (diff)
downloadninja-53051672a62208fbc96957719d8285fac6431ed6.tar.gz
Merge branch 'refs/heads/NINJA-master' into TimelineUber
Conflicts: js/panels/Timeline/DragDrop.js js/panels/Timeline/Keyframe.reel/Keyframe.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js js/panels/Timeline/Span.reel/Span.js js/panels/Timeline/Style.reel/Style.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js js/panels/Timeline/Track.reel/Track.html js/panels/Timeline/Track.reel/Track.js js/panels/Timeline/Track.reel/css/Track.css js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css js/panels/Timeline/Tween.reel/Tween.js Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Project')
-rwxr-xr-xjs/panels/Project/ProjectPanel.js39
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/ProjectPanelBase.js3683
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html197
3 files changed, 1961 insertions, 1958 deletions
diff --git a/js/panels/Project/ProjectPanel.js b/js/panels/Project/ProjectPanel.js
index 5dcba3e7..faa9f921 100755
--- a/js/panels/Project/ProjectPanel.js
+++ b/js/panels/Project/ProjectPanel.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -29,12 +30,12 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 30</copyright> */
30 31
31var Montage = require("montage/core/core").Montage, 32var Montage = require("montage/core/core").Montage,
32 PanelBase = require("js/panels/PanelBase").PanelBase, 33 PanelBase = require("js/panels/PanelBase").PanelBase,
33 ProjectPanelBase = require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase; 34 ProjectPanelBase = require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
34 35
35exports.ProjectPanel = Montage.create(PanelBase, { 36exports.ProjectPanel = Montage.create(PanelBase, {
36 37
37 id: {value: "projectPanel", writable: true, enumerable: true, configurable: true}, 38 id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
38 panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true}, 39 panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true},
39 panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true}, 40 panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true},
40 disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true}, 41 disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
@@ -42,9 +43,9 @@ exports.ProjectPanel = Montage.create(PanelBase, {
42 panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true}, 43 panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true},
43 44
44 init: { 45 init: {
45 enumerable: true, 46 enumerable: true,
46 value: function() { 47 value: function() {
47 //Creating panel container and panel 48 //Creating panel container and panel
48 this.minHeight = 350; 49 this.minHeight = 350;
49 this.defaultHeight = 350; 50 this.defaultHeight = 350;
50 this.contentHeight = 395; 51 this.contentHeight = 395;
@@ -57,7 +58,7 @@ exports.ProjectPanel = Montage.create(PanelBase, {
57 this._projectPanelBase.element = ppContainer; 58 this._projectPanelBase.element = ppContainer;
58 //Adding container to the parent 59 //Adding container to the parent
59 this.content = this._projectPanelBase; 60 this.content = this._projectPanelBase;
60 //Drawing panel 61 //Drawing panel
61 this._projectPanelBase.needsDraw = true; 62 this._projectPanelBase.needsDraw = true;
62 */ 63 */
63 64
diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
index 51aebc31..c82660f6 100755
--- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
+++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
@@ -1,24 +1,25 @@
1/* <copyright> 1/* <copyright>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, are permitted provided that the following conditions are met:
8 7
9 - Redistributions of source code must retain the above copyright notice, 8* Redistributions of source code must retain the above copyright notice,
10 this list of conditions and the following disclaimer. 9 this list of conditions and the following disclaimer.
11 - Redistributions in binary form must reproduce the above copyright 10
12 notice, this list of conditions and the following disclaimer in the 11* Redistributions in binary form must reproduce the above copyright notice,
13 documentation and/or other materials provided with the distribution. 12 this list of conditions and the following disclaimer in the documentation
14 - Neither the name of Motorola Mobility nor the names of its contributors 13 and/or other materials provided with the distribution.
15 may be used to endorse or promote products derived from this software 14
16 without specific prior written permission. 15* Neither the name of Motorola Mobility LLC nor the names of its
16 contributors may be used to endorse or promote products derived from this
17 software without specific prior written permission.
17 18
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -29,1868 +30,1868 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 30</copyright> */
30 31
31var TreeControl = require("js/components/tree.reel").Tree, 32var TreeControl = require("js/components/tree.reel").Tree,
32 ResizerControl = require("js/panels/Resizer").Resizer, 33 ResizerControl = require("js/panels/Resizer").Resizer,
33 nj = require("js/lib/NJUtils").NJUtils; 34 nj = require("js/lib/NJUtils").NJUtils;
34 35
35exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { 36exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
36 hasTemplate: { 37 hasTemplate: {
37 value: true 38 value: true
38 }, 39 },
39 _hasFocus: { 40 _hasFocus: {
40 numerable: false, 41 numerable: false,
41 value: false 42 value: false
42 }, 43 },
43 44
44 /* The current project that we have in memory */ 45 /* The current project that we have in memory */
45 _activeProject: { 46 _activeProject: {
46 value: false 47 value: false
47 }, 48 },
48 activeProject: { 49 activeProject: {
49 get: function() { 50 get: function() {
50 return this._activeProject; 51 return this._activeProject;
51 }, 52 },
52 set: function(objNewProject) { 53 set: function(objNewProject) {
53 this._activeProject = objNewProject; 54 this._activeProject = objNewProject;
54 } 55 }
55 }, 56 },
56 57
57 /* Is the panel initialized? Helps keep us from re-initializing things when a project switches */ 58 /* Is the panel initialized? Helps keep us from re-initializing things when a project switches */
58 _isPanelInitialized: { 59 _isPanelInitialized: {
59 value: false 60 value: false
60 }, 61 },
61 isPanelInitialized: { 62 isPanelInitialized: {
62 get: function() { 63 get: function() {
63 return this._isPanelInitialized; 64 return this._isPanelInitialized;
64 }, 65 },
65 set: function(boolValue) { 66 set: function(boolValue) {
66 this._isPanelInitialized = boolValue; 67 this._isPanelInitialized = boolValue;
67 } 68 }
68 }, 69 },
69 70
70 /* Project models: is there an active project, did the user just swap the project, etc. */ 71 /* Project models: is there an active project, did the user just swap the project, etc. */
71 _swapProject: { 72 _swapProject: {
72 value: false 73 value: false
73 }, 74 },