aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-04 14:56:24 -0700
committerJon Reid2012-05-04 14:56:24 -0700
commita6dd2917edcfeca1be7553e03281ddd538422ae1 (patch)
treee6846626bf1e967e80bcd652f6a76bb97abb1789 /js/ninja.reel
parent7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff)
parent8964e070fa760d23c2de272ca36b8d9beba6007d (diff)
downloadninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/ninja.reel')
-rwxr-xr-xjs/ninja.reel/ninja.html23
1 files changed, 19 insertions, 4 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 3c4a4537..34dc8135 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -196,6 +196,13 @@
196 } 196 }
197 }, 197 },
198 198
199 "editorViewOptions": {
200 "prototype": "js/code-editor/ui/code-editor-view-options.reel",
201 "properties": {
202 "element": {"#": "editorViewOptions"}
203 }
204 },
205
199 "panelContainer": { 206 "panelContainer": {
200 "prototype": "js/panels/PanelContainer.reel", 207 "prototype": "js/panels/PanelContainer.reel",
201 "properties": { 208 "properties": {
@@ -262,7 +269,6 @@
262 "oneway": true 269 "oneway": true
263 } 270 }
264 } 271 }
265
266 }, 272 },
267 273
268 "documentController1": { 274 "documentController1": {
@@ -311,6 +317,10 @@
311 } 317 }
312 }, 318 },
313 319
320 "codeEditorController": {
321 "prototype": "js/controllers/code-editor-controller"
322 },
323
314 "owner": { 324 "owner": {
315 "prototype": "js/ninja.reel", 325 "prototype": "js/ninja.reel",
316 "properties": { 326 "properties": {
@@ -336,12 +346,16 @@
336 "newFileController": {"@": "newFileController"}, 346 "newFileController": {"@": "newFileController"},
337 "coreIoApi": {"@": "coreIoApi1"}, 347 "coreIoApi": {"@": "coreIoApi1"},
338 "documentBar": {"@": "documentBar"}, 348 "documentBar": {"@": "documentBar"},
349 "editorViewOptions": {"@": "editorViewOptions"},
339 "ioMediator": {"@": "ioMediator"}, 350 "ioMediator": {"@": "ioMediator"},
340 "timeline": {"@": "timeline"}, 351 "timeline": {"@": "timeline"},
341 "mainMenuController": {"@": "mainMenuController"}, 352 "mainMenuController": {"@": "mainMenuController"},
353 "codeEditorController": {"@": "codeEditorController"},
342 "rightPanelContainer": {"#": "rightPanelContainer" }, 354 "rightPanelContainer": {"#": "rightPanelContainer" },
343 "panelSplitter": {"@": "splitter3"}, 355 "panelSplitter": {"@": "splitter3"},
344 "timelineSplitter": {"@": "splitter4"} 356 "timelineSplitter": {"@": "splitter4"},
357 "toolsSplitter": {"@": "splitter2"},
358 "optionsSplitter": {"@": "splitter1"}
345 } 359 }
346 } 360 }
347 } 361 }
@@ -399,7 +413,8 @@
399 <section id="timelineResizer" class="timelineResizer resizeBar"></section> 413 <section id="timelineResizer" class="timelineResizer resizeBar"></section>
400 <section id="stateBar"> 414 <section id="stateBar">
401 <section id="documentBarContainer"> 415 <section id="documentBarContainer">
402 <div id="documentBar" class="documentBar"><a href="#">HTML</a></div> 416 <div id="documentBar" class="documentBar" style="display:block"><a href="#">HTML</a></div>
417 <div id="editorViewOptions" class="editorViewOptions" style="display:none"><a href="#">HTML</a></div>
403 </section> 418 </section>
404 </section> 419 </section>
405 420