diff options
author | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
commit | 6d3af6cb9dc8223102854ad95a5c4c501fc62c8b (patch) | |
tree | 07afdbeacd26f01414933d5b3318786cec30f4a8 /js/data/panels-data.js | |
parent | 2a87a750f06003fc62e8e0e73983e14ce24fc7a7 (diff) | |
parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
download | ninja-6d3af6cb9dc8223102854ad95a5c4c501fc62c8b.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/data/panels-data.js')
-rw-r--r-- | js/data/panels-data.js | 12 |
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 | } |