aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-15 15:20:09 -0700
committerArmen Kesablyan2012-06-15 15:20:09 -0700
commit593cad77591344a7f5667a01c252c82c5bb12ba3 (patch)
treeca586e2c9bc912494a342c201f63d453d899ca2e /js/data
parent45aeaaf9aa61dcd5a55f12817ef8e6036ba74606 (diff)
parent9184efdaff88d3ce0e949dbe7ccbb3324dbfaae9 (diff)
downloadninja-593cad77591344a7f5667a01c252c82c5bb12ba3.tar.gz
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
Diffstat (limited to 'js/data')
-rw-r--r--js/data/panels-data.js27
1 files changed, 14 insertions, 13 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 6792aa51..fd83d0c7 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -125,20 +125,21 @@ exports.PanelsData = Montage.create(Montage, {
125 open: true, 125 open: true,
126 modulePath: "js/panels/binding-panel.reel", 126 modulePath: "js/panels/binding-panel.reel",
127 moduleName: "BindingPanel" 127 moduleName: "BindingPanel"
128 },
129 {
130 name: "Objects",
131 groups: ["ws-binding"],
132 minHeight: 100,
133 height: 100,
134 maxHeight: null,
135 flexible: true,
136 collapsed: true,
137 scrollable: true,
138 open: true,
139 modulePath: "js/panels/objects/objects-panel.reel",
140 moduleName: "ObjectsPanel"
141 } 128 }
129// ,
130// {
131// name: "Objects",
132// groups: ["ws-binding"],
133// minHeight: 100,
134// height: 100,
135// maxHeight: null,
136// flexible: true,
137// collapsed: true,
138// scrollable: true,
139// open: true,
140// modulePath: "js/panels/objects/objects-panel.reel",
141// moduleName: "ObjectsPanel"
142// }
142 ] 143 ]
143 } 144 }
144 145