diff options
author | Jon Reid | 2012-03-06 18:08:37 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-06 18:08:37 -0800 |
commit | 6056fdb63b5f4690115e63ee50e8d7dac309ba64 (patch) | |
tree | 5fbe386e4c7732fb84b98c9539b186898f076c7b /js/data | |
parent | bcfb704b04587f95a13c474cf0598ba90ec3b371 (diff) | |
parent | a12603cfcfe9d82def3b972dcbcc80f1e790ad85 (diff) | |
download | ninja-6056fdb63b5f4690115e63ee50e8d7dac309ba64.tar.gz |
Merge branch 'Timeline-uber' into timeline-serialized
Diffstat (limited to 'js/data')
-rw-r--r-- | js/data/panels-data.js | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js index aa5057a2..2422f5e7 100644 --- a/js/data/panels-data.js +++ b/js/data/panels-data.js | |||
@@ -19,7 +19,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
19 | scrollable: false, | 19 | scrollable: false, |
20 | collapsed: false, | 20 | collapsed: false, |
21 | open: true, | 21 | open: true, |
22 | contentComponent: null, | ||
23 | modulePath: "js/panels/Color/colorpanelbase.reel", | 22 | modulePath: "js/panels/Color/colorpanelbase.reel", |
24 | moduleName: "ColorPanelBase" | 23 | moduleName: "ColorPanelBase" |
25 | }, | 24 | }, |
@@ -32,7 +31,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
32 | scrollable: true, | 31 | scrollable: true, |
33 | collapsed: false, | 32 | collapsed: false, |
34 | open: true, | 33 | open: true, |
35 | contentComponent: null, | ||
36 | modulePath: "js/panels/properties.reel", | 34 | modulePath: "js/panels/properties.reel", |
37 | moduleName: "Properties" | 35 | moduleName: "Properties" |
38 | }, | 36 | }, |
@@ -45,7 +43,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
45 | collapsed: true, | 43 | collapsed: true, |
46 | scrollable: true, | 44 | scrollable: true, |
47 | open: true, | 45 | open: true, |
48 | contentComponent: null, | ||
49 | modulePath: "js/panels/Materials/materials-library-panel.reel", | 46 | modulePath: "js/panels/Materials/materials-library-panel.reel", |
50 | moduleName: "MaterialsLibraryPanel" | 47 | moduleName: "MaterialsLibraryPanel" |
51 | }, | 48 | }, |
@@ -58,7 +55,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
58 | scrollable: true, | 55 | scrollable: true, |
59 | collapsed: true, | 56 | collapsed: true, |
60 | open: true, | 57 | open: true, |
61 | contentComponent: null, | ||
62 | modulePath: "js/panels/Components/ComponentsPanelBase.reel", | 58 | modulePath: "js/panels/Components/ComponentsPanelBase.reel", |
63 | moduleName: "ComponentsPanelBase" | 59 | moduleName: "ComponentsPanelBase" |
64 | }, | 60 | }, |
@@ -71,7 +67,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
71 | // scrollable: true, | 67 | // scrollable: true, |
72 | // collapsed: false, | 68 | // collapsed: false, |
73 | // open: true, | 69 | // open: true, |
74 | // content: null, | ||
75 | // modulePath: "js/panels/Project/projectpanelbase.reel", | 70 | // modulePath: "js/panels/Project/projectpanelbase.reel", |
76 | // moduleName: "ProjectPanelBase" | 71 | // moduleName: "ProjectPanelBase" |
77 | // }, | 72 | // }, |
@@ -84,7 +79,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
84 | scrollable: true, | 79 | scrollable: true, |
85 | collapsed: true, | 80 | collapsed: true, |
86 | open: true, | 81 | open: true, |
87 | contentComponent: null, | ||
88 | modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", | 82 | modulePath: "js/panels/CSSPanel/CSSPanelBase.reel", |
89 | moduleName: "CSSPanelBase" | 83 | moduleName: "CSSPanelBase" |
90 | }, | 84 | }, |
@@ -97,7 +91,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
97 | collapsed: true, | 91 | collapsed: true, |
98 | scrollable: true, | 92 | scrollable: true, |
99 | open: true, | 93 | open: true, |
100 | contentComponent: null, | ||
101 | modulePath: "js/panels/presets/content.reel", | 94 | modulePath: "js/panels/presets/content.reel", |
102 | moduleName: "content" | 95 | moduleName: "content" |
103 | } | 96 | } |
@@ -118,24 +111,6 @@ exports.PanelsData = Montage.create(Montage, { | |||
118 | this._panelOrder = val; | 111 | this._panelOrder = val; |
119 | } | 112 | } |
120 | } | 113 | } |
121 | |||
122 | |||
123 | panels: { | ||
124 | get: function() { | ||
125 | var filtered = this._panels.filter(function(item) { | ||
126 | return item.open; | ||
127 | }); | ||
128 | |||
129 | filtered.sort(function(a,b) { | ||
130 | a.name | ||
131 | }); | ||
132 | |||
133 | return filtered; | ||
134 | }, | ||
135 | set : function() { | ||
136 | |||
137 | } | ||
138 | } | ||
139 | */ | 114 | */ |
140 | 115 | ||
141 | }); \ No newline at end of file | 116 | }); \ No newline at end of file |