From f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 Mon Sep 17 00:00:00 2001 From: Ananya Sen Date: Fri, 10 Feb 2012 16:05:27 -0800 Subject: Revert "Merge from /joseeight/ninja-internal/tree/FileIO" This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen --- js/ninja.reel/ninja.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'js/ninja.reel/ninja.html') diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index a17f6583..6630f4a8 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html @@ -232,7 +232,7 @@ }, "documentController1": { - "module": "js/controllers/document-controller", + "module": "js/io/document/document-controller", "name": "DocumentController" }, @@ -293,8 +293,7 @@ "newFileController": {"@": "newFileController"}, "coreIoApi": {"@": "coreIoApi1"}, "documentBar": {"@": "documentBar"}, - "ioMediator": {"@": "ioMediator"}, - "timeline": {"@": "timeline"} + "ioMediator": {"@": "ioMediator"} } } @@ -359,10 +358,13 @@
- +
+ + +
-- cgit v1.2.3