aboutsummaryrefslogtreecommitdiff
path: root/js/panels/PanelContainer/PanelContainer.reel
diff options
context:
space:
mode:
authorEric Guzman2012-02-22 23:18:12 -0800
committerEric Guzman2012-02-22 23:18:12 -0800
commita5ee11857f923d3e49b44c0a8c480e9d0b026d5b (patch)
tree55bb6d0dc2ee710290ac5af0bb46ec66a6b2e381 /js/panels/PanelContainer/PanelContainer.reel
parent1c528b42f9b1c9be9197921586388c3a3bdc5c17 (diff)
downloadninja-a5ee11857f923d3e49b44c0a8c480e9d0b026d5b.tar.gz
CSS Panel Update
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel')
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index b8223471..db0f494b 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -16,6 +16,7 @@ var ComponentsPanel = require("js/panels/Components/ComponentsPanel").Components
16var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel; 16var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel;
17var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel; 17var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel;
18var PresetsPanel = require("js/panels/presets/presets-panel").PresetsPanel; 18var PresetsPanel = require("js/panels/presets/presets-panel").PresetsPanel;
19var CSSPanelNew = require("js/panels/css-panel/css-panel-container").CSSPanelContainer;
19 20
20exports.PanelContainer = Montage.create(Component, { 21exports.PanelContainer = Montage.create(Component, {
21 lastOffset: { 22 lastOffset: {
@@ -45,7 +46,7 @@ exports.PanelContainer = Montage.create(Component, {
45 }, 46 },
46 47
47 initPanelOrder: { 48 initPanelOrder: {
48 value: ['PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel'] 49 value: ['CSSPanelNew','PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel']
49 }, 50 },
50 51
51 panelOrder: { 52 panelOrder: {
@@ -101,6 +102,7 @@ exports.PanelContainer = Montage.create(Component, {
101 this.addEventListener("change@appModel.CSSPanel", this, false); 102 this.addEventListener("change@appModel.CSSPanel", this, false);
102 this.addEventListener("change@appModel.MaterialsPanel", this, false); 103 this.addEventListener("change@appModel.MaterialsPanel", this, false);
103 this.addEventListener("change@appModel.PresetsPanel", this, false); 104 this.addEventListener("change@appModel.PresetsPanel", this, false);
105 this.addEventListener("change@appModel.CSSPanelNew", this, false);
104 } 106 }
105 }, 107 },
106 108