aboutsummaryrefslogtreecommitdiff
path: root/js/data/panels-data.js
diff options
context:
space:
mode:
authorJonathan Duran2012-04-18 08:08:14 -0700
committerJonathan Duran2012-04-18 08:08:14 -0700
commit9f05148454783fd761c9cad35a169c6cb164c1a4 (patch)
tree02b9cac67ce4215443beab9f47fa4cf216e77840 /js/data/panels-data.js
parenta2af3c8bd2349a24dd7de920381b04847a863a46 (diff)
parent616a8532099fec2a15855eac97cd85cb60c4451c (diff)
downloadninja-9f05148454783fd761c9cad35a169c6cb164c1a4.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'js/data/panels-data.js')
-rw-r--r--js/data/panels-data.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 7a2d817a..f613a3be 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -93,6 +93,18 @@ exports.PanelsData = Montage.create(Montage, {
93 open: true, 93 open: true,
94 modulePath: "js/panels/presets/content.reel", 94 modulePath: "js/panels/presets/content.reel",
95 moduleName: "content" 95 moduleName: "content"
96 },
97 {
98 name: "History",
99 minHeight: 100,
100 height: 100,
101 maxHeight: null,
102 flexible: true,
103 collapsed: true,
104 scrollable: true,
105 open: true,
106 modulePath: "js/panels/history-panel/history.reel",
107 moduleName: "History"
96 } 108 }
97 ] 109 ]
98 } 110 }