diff options
author | Eric Guzman | 2012-03-02 10:55:51 -0800 |
---|---|---|
committer | Eric Guzman | 2012-03-02 10:55:51 -0800 |
commit | 1433f2bdf2e5b8c5c18fed5e9c17fd983ab3606d (patch) | |
tree | 885ed3352f89e124bca7261d7c0edd4c95d3fff5 /js/panels/PanelContainer/PanelContainer.reel | |
parent | 53bdb1e7773069c4cca59e88d6da91cd0f58c94a (diff) | |
download | ninja-1433f2bdf2e5b8c5c18fed5e9c17fd983ab3606d.tar.gz |
CSS Panel - Updating components, created toolbar components, and small changes to styles controller
Diffstat (limited to 'js/panels/PanelContainer/PanelContainer.reel')
-rwxr-xr-x | js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js | 4 |
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 003724bb..54320eef 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 | |||
16 | var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel; | 16 | var ProjectPanel = require("js/panels/Project/ProjectPanel").ProjectPanel; |
17 | var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel; | 17 | var MaterialsPanel = require("js/panels/Materials/MaterialsPanel").MaterialsPanel; |
18 | var PresetsPanel = require("js/panels/presets/presets-panel").PresetsPanel; | 18 | var PresetsPanel = require("js/panels/presets/presets-panel").PresetsPanel; |
19 | var CSSPanelNew = require("js/panels/css-panel/css-panel-container").CSSPanelContainer; | ||
19 | 20 | ||
20 | exports.PanelContainer = Montage.create(Component, { | 21 | exports.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: ['ColorPanel', 'PropertiesPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel'] | 49 | value: ['CSSPanelNew','PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel'] |
49 | }, | 50 | }, |
50 | 51 | ||
51 | panelOrder: { | 52 | panelOrder: { |
@@ -106,6 +107,7 @@ exports.PanelContainer = Montage.create(Component, { | |||
106 | this.addEventListener("change@appModel.CSSPanel", this, false); | 107 | this.addEventListener("change@appModel.CSSPanel", this, false); |
107 | this.addEventListener("change@appModel.MaterialsPanel", this, false); | 108 | this.addEventListener("change@appModel.MaterialsPanel", this, false); |
108 | this.addEventListener("change@appModel.PresetsPanel", this, false); | 109 | this.addEventListener("change@appModel.PresetsPanel", this, false); |
110 | this.addEventListener("change@appModel.CSSPanelNew", this, false); | ||
109 | } | 111 | } |
110 | }, | 112 | }, |
111 | 113 | ||