aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorEric Guzman2012-02-16 16:10:33 -0800
committerEric Guzman2012-02-16 16:10:33 -0800
commitfa51b9cf6c034313c10cf2963e720feeeabcfc4a (patch)
tree698752cdd88e53684fe538c115a204d25b5bbb28 /js
parent58e890864ec619128510ecbfb956d4a10e782c8d (diff)
downloadninja-fa51b9cf6c034313c10cf2963e720feeeabcfc4a.tar.gz
Presets Panel - Move to bottom, add to menu
Diffstat (limited to 'js')
-rwxr-xr-xjs/data/menu-data.js9
-rwxr-xr-xjs/panels/PanelContainer/PanelContainer.reel/PanelContainer.js4
2 files changed, 11 insertions, 2 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 3a065958..6503e776 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -352,6 +352,15 @@ exports.MenuData = Montage.create( Montage, {
352 } 352 }
353 }, 353 },
354 { 354 {
355 "displayText" : "Presets",
356 "hasSubMenu" : false,
357 "enabled": true,
358 "checked": {
359 "value": true,
360 "boundProperty": "PresetsPanel"
361 }
362 },
363 {
355 "displayText" : "Code", 364 "displayText" : "Code",
356 "hasSubMenu" : false, 365 "hasSubMenu" : false,
357 "enabled": true 366 "enabled": true
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index 0569cc51..b8223471 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -45,7 +45,7 @@ exports.PanelContainer = Montage.create(Component, {
45 }, 45 },
46 46
47 initPanelOrder: { 47 initPanelOrder: {
48 value: ['PresetsPanel','PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel'] 48 value: ['PropertiesPanel','ColorPanel','ComponentsPanel','ProjectPanel','CSSPanel','MaterialsPanel','PresetsPanel']
49 }, 49 },
50 50
51 panelOrder: { 51 panelOrder: {
@@ -94,13 +94,13 @@ exports.PanelContainer = Montage.create(Component, {
94 94
95// this.needsDraw = true; 95// this.needsDraw = true;
96 96
97 this.addEventListener("change@appModel.PresetsPanel", this, false);
98 this.addEventListener("change@appModel.PropertiesPanel", this, false); 97 this.addEventListener("change@appModel.PropertiesPanel", this, false);
99 this.addEventListener("change@appModel.ProjectPanel", this, false); 98 this.addEventListener("change@appModel.ProjectPanel", this, false);
100 this.addEventListener("change@appModel.ColorPanel", this, false); 99 this.addEventListener("change@appModel.ColorPanel", this, false);
101 this.addEventListener("change@appModel.ComponentsPanel", this, false); 100 this.addEventListener("change@appModel.ComponentsPanel", this, false);
102 this.addEventListener("change@appModel.CSSPanel", this, false); 101 this.addEventListener("change@appModel.CSSPanel", this, false);
103 this.addEventListener("change@appModel.MaterialsPanel", this, false); 102 this.addEventListener("change@appModel.MaterialsPanel", this, false);
103 this.addEventListener("change@appModel.PresetsPanel", this, false);
104 } 104 }
105 }, 105 },
106 106