aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Project
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 14:35:44 -0700
committerValerio Virgillito2012-07-09 14:35:44 -0700
commit84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /js/panels/Project
parentc0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
downloadninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts: js/components/gradientpicker.reel/gradientpicker.js js/components/tools-properties/text-properties.reel/text-properties.js js/document/views/base.js js/document/views/design.js js/helper-classes/3D/StageLine.js js/helper-classes/3D/draw-utils.js js/lib/drawing/world.js js/lib/geom/circle.js js/lib/geom/line.js js/lib/geom/rectangle.js js/lib/geom/shape-primitive.js js/lib/rdge/materials/bump-metal-material.js js/lib/rdge/materials/flag-material.js js/lib/rdge/materials/fly-material.js js/lib/rdge/materials/julia-material.js js/lib/rdge/materials/keleidoscope-material.js js/lib/rdge/materials/mandel-material.js js/lib/rdge/materials/material.js js/lib/rdge/materials/plasma-material.js js/lib/rdge/materials/pulse-material.js js/lib/rdge/materials/radial-gradient-material.js js/lib/rdge/materials/taper-material.js js/lib/rdge/materials/twist-vert-material.js js/lib/rdge/materials/water-material.js js/panels/Materials/materials-library-panel.reel/materials-library-panel.html js/panels/Materials/materials-library-panel.reel/materials-library-panel.js js/panels/Materials/materials-popup.reel/materials-popup.html js/panels/Materials/materials-popup.reel/materials-popup.js js/tools/LineTool.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/Project')
-rwxr-xr-xjs/panels/Project/ProjectPanel.js16
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/ProjectPanelBase.js3660
-rwxr-xr-xjs/panels/Project/projectpanelbase.reel/projectpanelbase.html176
3 files changed, 1926 insertions, 1926 deletions
diff --git a/js/panels/Project/ProjectPanel.js b/js/panels/Project/ProjectPanel.js
index 5dcba3e7..35ba0a2f 100755
--- a/js/panels/Project/ProjectPanel.js
+++ b/js/panels/Project/ProjectPanel.js
@@ -29,12 +29,12 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 PanelBase = require("js/panels/PanelBase").PanelBase, 32 PanelBase = require("js/panels/PanelBase").PanelBase,
33 ProjectPanelBase = require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase; 33 ProjectPanelBase = require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
34 34
35exports.ProjectPanel = Montage.create(PanelBase, { 35exports.ProjectPanel = Montage.create(PanelBase, {
36 36
37 id: {value: "projectPanel", writable: true, enumerable: true, configurable: true}, 37 id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
38 panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true}, 38 panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true},
39 panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true}, 39 panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true},
40 disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true}, 40 disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
@@ -42,9 +42,9 @@ exports.ProjectPanel = Montage.create(PanelBase, {
42 panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true}, 42 panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true},
43 43
44 init: { 44 init: {
45 enumerable: true, 45 enumerable: true,
46 value: function() { 46 value: function() {
47 //Creating panel container and panel 47 //Creating panel container and panel
48 this.minHeight = 350; 48 this.minHeight = 350;
49 this.defaultHeight = 350; 49 this.defaultHeight = 350;
50 this.contentHeight = 395; 50 this.contentHeight = 395;
@@ -57,7 +57,7 @@ exports.ProjectPanel = Montage.create(PanelBase, {
57 this._projectPanelBase.element = ppContainer; 57 this._projectPanelBase.element = ppContainer;
58 //Adding container to the parent 58 //Adding container to the parent
59 this.content = this._projectPanelBase; 59 this.content = this._projectPanelBase;
60 //Drawing panel 60 //Drawing panel
61 this._projectPanelBase.needsDraw = true; 61 this._projectPanelBase.needsDraw = true;
62 */ 62 */
63 63
diff --git a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
index 51aebc31..84b24022 100755
--- a/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
+++ b/js/panels/Project/projectpanelbase.reel/ProjectPanelBase.js
@@ -29,1868 +29,1868 @@ POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var TreeControl = require("js/components/tree.reel").Tree, 31var TreeControl = require("js/components/tree.reel").Tree,
32 ResizerControl = require("js/panels/Resizer").Resizer, 32 ResizerControl = require("js/panels/Resizer").Resizer,
33 nj = require("js/lib/NJUtils").NJUtils; 33 nj = require("js/lib/NJUtils").NJUtils;
34 34
35exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { 35exports.ProjectPanelBase = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
36 hasTemplate: { 36 hasTemplate: {
37 value: true 37 value: true
38 }, 38 },
39 _hasFocus: { 39 _hasFocus: {
40 numerable: false, 40 numerable: false,
41 value: false 41 value: false
42 }, 42 },
43 43
44 /* The current project that we have in memory */ 44 /* The current project that we have in memory */
45 _activeProject: { 45 _activeProject: {
46 value: false 46 value: false
47 }, 47 },
48 activeProject: { 48 activeProject: {
49 get: function() { 49 get: function() {
50 return this._activeProject; 50 return this._activeProject;
51 }, 51 },
52 set: function(objNewProject) { 52 set: function(objNewProject) {
53 this._activeProject = objNewProject; 53 this._activeProject = objNewProject;
54 } 54 }
55 }, 55 },
56 56
57 /* Is the panel initialized? Helps keep us from re-initializing things when a project switches */ 57 /* Is the panel initialized? Helps keep us from re-initializing things when a project switches */
58 _isPanelInitialized: { 58 _isPanelInitialized: {
59 value: false 59 value: false
60 }, 60 },
61 isPanelInitialized: { 61 isPanelInitialized: {
62 get: function() { 62 get: function() {
63 return this._isPanelInitialized; 63 return this._isPanelInitialized;
64 }, 64 },
65 set: function(boolValue) { 65 set: function(boolValue) {
66 this._isPanelInitialized = boolValue; 66 this._isPanelInitialized = boolValue;
67 } 67 }
68 }, 68 },
69 69
70 /* Project models: is there an active project, did the user just swap the project, etc. */ 70 /* Project models: is there an active project, did the user just swap the project, etc. */
71 _swapProject: { 71 _swapProject: {
72 value: false 72 value: false
73 }, 73 },
74 swapProject: { 74 swapProject: {
75 get: function() { 75 get: function() {
76 return this._swapProject; 76 return this._swapProject;
77 }, 77 },
78 set: function(boolValue) { 78 set: function(boolValue) {
79 this._swapProject = boolValue; 79 this._swapProject = boolValue;
80 } 80 }
81 }, 81 },
82 _updateTree: { 82 _updateTree: {
83 value: false 83 value: false
84 }, 84 },
85 updateTree: { 85 updateTree: {
86 get: function() { 86 get: function() {
87 return this._updateTree; 87 return this._updateTree;
88 }, 88 },
89 set: function(boolValue) { 89 set: function(boolValue) {
90 this._updateTree = boolValue; 90 this._updateTree = boolValue;
91 } 91 }
92 }, 92 },
93 _updateAssets: { 93 _updateAssets: {
94 value: false 94 value: false
95 }, 95 },
96 _updateAssets : { 96 _updateAssets : {
97 get: function() { 97 get: function() {
98 return this._updateAssets; 98 return this._updateAssets;
99 }, 99 },
100 set: function(boolValue) { 100 set: function(boolValue) {
101 this._updateAssets = boolValue; 101 this._updateAssets = boolValue;
102 } 102 }
103 }, 103 },
104 _hasActiveProject: { 104 _hasActiveProject: {
105 value: false 105 value: false
106 }, 106 },
107 hasActiveProject: { 107 hasActiveProject: {
108 get: function() { 108 get: function() {
109 return this._hasActiveProject; 109 return this._hasActiveProject;
110 }, 110 },
111 set: function(boolValue) { 111 set: function(boolValue) {
112 if (this.hasActiveProject !== boolValue) { 112 if (this.hasActiveProject !== boolValue) {
113 this._hasActiveProject = boolValue; 113 this._hasActiveProject = boolValue;
114 this.needsDraw = true; 114 this.needsDraw = true;
115 this.swapProject = true; 115 this.swapProject = true;
116 this.loadPanelState(); 116 this.loadPanelState();
117 } 117 }
118 } 118 }
119 }, 119 },
120 setActiveProject: { 120 setActiveProject: {
121 value: function(myVal) { 121 value: function(myVal) {
122 this.hasActiveProject = myVal; 122 this.hasActiveProject = myVal;
123